diff --git a/amadeus/settings.py b/amadeus/settings.py
index 18ffe36..8b4c39e 100644
--- a/amadeus/settings.py
+++ b/amadeus/settings.py
@@ -56,6 +56,7 @@ INSTALLED_APPS = [
     'forum',
     'poll',
     'links',
+    'exam',
     'files',
 
 ]
diff --git a/courses/urls.py b/courses/urls.py
index 4c6cfa0..f79ca30 100644
--- a/courses/urls.py
+++ b/courses/urls.py
@@ -27,7 +27,7 @@ urlpatterns = [
 	url(r'^subjects/categories$',views.IndexSubjectCategoryView.as_view(), name='subject_category_index'),
 	url(r'^forum/', include('forum.urls', namespace = 'forum')),
 	url(r'^poll/', include('poll.urls', namespace = 'poll')),
-	# url(r'^exam/', include('exam.urls', namespace = 'exam')),
+	url(r'^exam/', include('exam.urls', namespace = 'exam')),
 	url(r'^files/', include('files.urls', namespace = 'file')),
 	url(r'^upload-material/$', views.UploadMaterialView.as_view(), name='upload_material'),
 	url(r'^links/',include('links.urls',namespace = 'links')),
diff --git a/exam/models.py b/exam/models.py
index e3f5c49..acda393 100644
--- a/exam/models.py
+++ b/exam/models.py
@@ -7,6 +7,7 @@ from courses.models import Activity
 
 class Exam(Activity):
 	begin_date = models.DateField(_('Begin of Course Date'), blank=True)
+	exibe = models.BooleanField(_('Exibe?'), default=False)
 
 	class Meta:
 		verbose_name = _('Exam')
@@ -33,7 +34,7 @@ class AnswersStudent(models.Model):
     status = models.BooleanField(_("Answered"), default=False)
     exam = models.ForeignKey(Exam, verbose_name = _('Exam'), related_name='answers_stundet')
     answer = models.ManyToManyField(Answer,verbose_name = _('Answers Students'), related_name='answers_stundet')
-    student = models.ForeignKey(User, verbose_name = _('Student'), related_name='answers_stundent')
+    student = models.ForeignKey(User, verbose_name = _('Student'), related_name='answers_stundent_exam')
     answered_in = models.DateTimeField(_("Answered Date"),auto_now=True)
 
     class Meta:
diff --git a/exam/templates/exam/create.html b/exam/templates/exam/create.html
index e69de29..76ec38f 100644
--- a/exam/templates/exam/create.html
+++ b/exam/templates/exam/create.html
@@ -0,0 +1,270 @@
+ma  {% extends "base.html" %}
+{% block content %}
+<div class="modal fade" id="poll" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+
+      <!-- Modal Header -->
+      <div class="modal-header">
+
+        {% block title_poll %}
+        <!-- Put your title here!!!  -->
+        <h4 class="modal-title" id="myModalLabel">{% trans "Create a Exam" %}</h4>
+        {% endblock title_poll %}
+      </div>
+      <!-- Modal Body -->
+      <div class="modal-body">
+
+    {# <form id="ac" class="form-horizontal"> #}
+      {# <fieldset> #}
+
+      <div class="form-group">
+        <label for="examName" class="col-md-2 control-label">Exam Name</label>
+
+        <div class="col-md-10">
+          <input type="text" class="form-control" id="examName" placeholder="Exam Name">
+        </div>
+
+
+      </div>
+      <div class="form-group">
+        <label for="Date" class="col-md-2 control-label">Exam Period</label>
+        <div class="col-md-5">
+          <input type="date" class="form-control" id="beginDate" placeholder="Begin Date">
+        </div>
+        <div class="col-md-5">
+          <input type="text" class="form-control" id="datepicker" placeholder="End Date">
+
+        </div>
+      </div>
+      <div class="form-group">
+        <label for="deadline" class="col-md-2 control-label">Allow submissions after deadline?</label>
+        <div class="col-md-10">
+          <label>
+            <input type="checkbox">
+          </label>
+        </div>
+      </div>
+      <div class="form-group">
+        <label for="questionType" class="col-md-2 control-label">Question Type</label>
+        <div class="col-md-10">
+          <select id="questionType" class="form-control" onchange="showDiv (this)">
+            <option selected disabled>Question Type</option>
+            <option value="0">Multiple Choice</option>
+            <option value="1">True or False</option>
+            <option value="2">Gap Filling</option>
+            <option value="3">Discursive Question</option>
+          </select>
+        </div>
+      </div>
+      <div class="form-group" id="multipleChoice" style="display: none;">
+       <form class="form-horizontal">
+  <fieldset>
+    <div class="form-group" id="multipleChoice">
+
+      <label for="questionName" class="col-md-2 control-label">Question</label>
+
+
+      <div class="col-md-10">
+        <textarea class="form-control" rows="1" id="questionName" placeholder="Wording"></textarea>
+      </div>
+
+
+    </div>
+    <div class="form-group">
+      <label for="alternative" class="col-md-2 control-label">Alternatives</label>
+      <div class="col-md-10" id="radios">
+        <div class="radio radio-primary">
+          <label>
+            <input checked type="radio" name="alternatives" id="alternative1" value="1">
+            <textarea class="form-control" rows="1" placeholder="Write your alternative"></textarea>
+          </label>
+        </div>
+        <div class="radio radio-primary">
+          <label>
+            <input type="radio" name="alternatives" id="alternative2" value="2">
+            <textarea class="form-control" rows="1" placeholder="Write your alternative"></textarea>
+          </label>
+        </div>
+      </div>
+    </div>
+    <!-- new alternative button -->
+    <div class="form-group">
+      <div class="col-md-12 col-md-offset-2">
+      <button type="button" class="btn btn-primary" id="newAlternative">New Alternative</button>
+      </div>
+    </div>
+    <div class="form-group">
+      <div class="col-md-12 col-md-offset-2">
+      <button type="submit" class="btn btn-primary">Save</button>
+      <button type="cancel" class="btn btn-default">Cancel</button>
+      </div>
+    </div>
+
+  </fieldset>
+</form>
+
+<script>
+  var alternativeValue = 3;
+
+  $('#newAlternative').click(function () {
+    var element = '<div class="radio radio-primary">' +
+          '<label>' +
+            '<input type="radio" name="alternatives" id="alternative4"' + 'value="' +alternativeValue + '">' +
+            '<textarea class="form-control" rows="1" placeholder="Write your alternative"></textarea>' +
+          '</label>' +
+        '</div>';
+    $('#radios').append(element);
+
+    alternativeValue++;
+  });
+</script>
+      </div>
+      <div class="form-group" id="trueOrFalse" style="display: none;">
+       <form class="form-horizontal" id="true-or-false">
+  <fieldset>
+    <div class="form-group" id="trueOrFalse">
+
+      <label for="questionName" class="col-md-2 control-label">Question</label>
+
+
+      <div class="col-md-10">
+        <textarea class="form-control" rows="1" id="questionName" placeholder="Wording"></textarea>
+      </div>
+
+
+    </div>
+    <div class="form-group">
+      <label for="alternative" class="col-md-2 control-label">Alternatives: T/F</label>
+      <div class="col-md-10" id="radiosTF">
+        <!-- alternative -->
+        <div class="radio radio-primary">
+            <label>
+            <textarea class="form-control" rows="1" placeholder="Write your alternative"></textarea>
+          </label>
+          <label>
+            <input type="radio" name="alternative1" value="T">
+          </label>
+          <label>
+            <input type="radio" name="alternative1" value="F">
+          </label>
+        </div>
+        <!-- alternative -->
+        <div class="radio radio-primary">
+            <label>
+            <textarea class="form-control" rows="1" placeholder="Write your alternative"></textarea>
+          </label>
+          <label>
+            <input type="radio" name="alternative2" value="T">
+          </label>
+          <label>
+            <input type="radio" name="alternative2" value="F">
+          </label>
+        </div>
+      </div>
+    </div>
+    <div class="form-group">
+      <div class="col-md-12 col-md-offset-2">
+      <button type="button" class="btn btn-primary" id="tfAlternative">New Alternative</button>
+      </div>
+    </div>
+    <div class="form-group">
+      <div class="col-md-12 col-md-offset-2">
+      <button type="submit" class="btn btn-primary">Save</button>
+      <button type="cancel" class="btn btn-default">Cancel</button>
+      </div>
+    </div>
+
+  </fieldset>
+</form>
+
+<script>
+  var tfAlternativeValue = 3;
+
+  $('#tfAlternative').click(function () {
+    var element = '<div class="radio radio-primary">' +
+            '<label>' +
+            '<textarea class="form-control" rows="1" placeholder="Write your alternative"></textarea>' +
+          '</label>' +
+          '<label>' +
+            '<input type="radio" name="alternative' + tfAlternativeValue +'" value="T">' +
+          '</label>' +
+          '<label>' +
+            '<input type="radio" name="alternative2" value="F">' +
+          '</label>' +
+        '</div>';
+    $('#radiosTF').append(element);
+
+    tfAlternativeValue++;
+  });
+</script>
+      </div>
+      <div class="form-group" id="gapFilling" style="display: none;">
+        <p>Gap Filling Question</p>
+      </div>
+      <div class="form-group" id="discursiveQuestion" style="display: none;">
+        <form class="form-horizontal" id="discursive-question">
+  <fieldset>
+    <div class="form-group" id="discursiveQuestion">
+
+      <label for="question" class="col-md-2 control-label">Question</label>
+
+
+      <div class="col-md-10">
+        <textarea class="form-control" rows="1" id="question" placeholder="Wording"></textarea>
+      </div>
+
+
+    </div>
+
+    <div class="form-group">
+      <div class="col-md-10 col-md-offset-2">
+      <button type="submit" class="btn btn-primary">Save</button>
+      <button type="cancel" class="btn btn-default">Cancel</button>
+      </div>
+    </div>
+
+  </fieldset>
+</form>
+      </div>
+      <div class="form-group">
+        <div class="col-md-12 col-md-offset-2">
+          <button type="submit" class="btn btn-primary">Save</button>
+          <button type="cancel" class="btn btn-default">Cancel</button>
+      </div>
+    </div>
+    </form>
+    </fieldset>
+  </div>
+</div>
+
+<script>
+  function showDiv (elem) {
+    if (elem.value == 0) {
+      document.getElementById('multipleChoice').style.display = "block";
+      document.getElementById('trueOrFalse').style.display = "none";
+      document.getElementById('gapFilling').style.display = "none";
+      document.getElementById('discursiveQuestion').style.display = "none";
+    } else if (elem.value == 1) {
+      document.getElementById('trueOrFalse').style.display = "block";
+      document.getElementById('multipleChoice').style.display = "none";
+      document.getElementById('gapFilling').style.display = "none";
+      document.getElementById('discursiveQuestion').style.display = "none";
+    } else if (elem.value == 2) {
+      document.getElementById('gapFilling').style.display = "block";
+      document.getElementById('multipleChoice').style.display = "none";
+      document.getElementById('trueOrFalse').style.display = "none";
+      document.getElementById('discursiveQuestion').style.display = "none";
+    } else if (elem.value == 3) {
+      document.getElementById('discursiveQuestion').style.display = "block";
+      document.getElementById('multipleChoice').style.display = "none";
+      document.getElementById('trueOrFalse').style.display = "none";
+      document.getElementById('gapFilling').style.display = "none";
+    }
+  }
+
+  $(function() {
+    $( "#datepicker" ).datepicker();
+  });
+</script>
+{% endblock content %}
diff --git a/exam/urls.py b/exam/urls.py
index 118cc17..45d70c7 100644
--- a/exam/urls.py
+++ b/exam/urls.py
@@ -1,12 +1,12 @@
-# from django.conf.urls import url
-#
-# from . import views
-#
-# urlpatterns = [
-# 	url(r'^create/(?P<slug>[\w\-_]+)/$', views.CreateExam.as_view(), name='create_exam'), # exam slug
-# 	url(r'^update/(?P<slug>[\w\-_]+)/$', views.UpdateExam.as_view(), name='update_exam'), # topic slug
-# 	url(r'^view/(?P<slug>[\w\-_]+)/$', views.ViewExam.as_view(), name='view_exam'), # exam slug
-# 	url(r'^delete/(?P<slug>[\w\-_]+)/$', views.DeleteExam.as_view(), name='delete_exam'), # exam
-# 	url(r'^answer/$', views.AnswerExam.as_view(), name='answer_exam'), # exam
-# 	url(r'^answer-exam/(?P<slug>[\w\-_]+)/$', views.AnswerStudentExam.as_view(), name='answer_student_exam'), # exam slug
-# ]
+from django.conf.urls import url
+
+from . import views
+
+urlpatterns = [
+	url(r'^create/(?P<slug>[\w\-_]+)/$', views.CreateExam.as_view(), name='create_exam'), # exam slug
+	url(r'^update/(?P<slug>[\w\-_]+)/$', views.UpdateExam.as_view(), name='update_exam'), # topic slug
+	url(r'^view/(?P<slug>[\w\-_]+)/$', views.ViewExam.as_view(), name='view_exam'), # exam slug
+	url(r'^delete/(?P<slug>[\w\-_]+)/$', views.DeleteExam.as_view(), name='delete_exam'), # exam
+	url(r'^answer/$', views.AnswerExam.as_view(), name='answer_exam'), # exam
+	url(r'^answer-exam/(?P<slug>[\w\-_]+)/$', views.AnswerStudentExam.as_view(), name='answer_student_exam'), # exam slug
+]
diff --git a/exam/views.py b/exam/views.py
index 77c2c74..653a47d 100644
--- a/exam/views.py
+++ b/exam/views.py
@@ -113,7 +113,7 @@ class UpdateExam(LoginRequiredMixin,HasRoleMixin,generic.UpdateView):
 		context = super(UpdateExam, self).form_invalid(form)
 		answers = {}
 		for key in self.request.POST:
-			if(key != 'csrfmiddlewaretoken' and key != 'name' and key != 'begin_date' and key != 'limit_date' and key != 'all_students' and key != 'students'):
+			if(key != 'csrfmiddlewaretoken' and key != 'name' and key != 'begin_date' and key != 'limit_date' and key!= 'exibe'  and key != 'all_students' and key != 'students'):
 				answers[key] = self.request.POST[key]
 
 		keys = sorted(answers)
@@ -131,7 +131,7 @@ class UpdateExam(LoginRequiredMixin,HasRoleMixin,generic.UpdateView):
 
 
 		for key in self.request.POST:
-			if(key != 'csrfmiddlewaretoken' and key != 'name' and key != 'begin_date' and key != 'limit_date' and key != 'all_students' and key != 'students'):
+			if(key != 'csrfmiddlewaretoken' and key != 'name' and key != 'begin_date' and key != 'limit_date' and key!= 'exibe'  and key != 'all_students' and key != 'students'):
 				answer = Answer(answer=self.request.POST[key],order=key,exam=exam)
 				answer.save()
 
--
libgit2 0.21.2