diff --git a/smash/web/templates/subjects/add.html b/smash/web/templates/subjects/add.html
new file mode 100644
index 0000000000000000000000000000000000000000..c8f5de44af9b0e660c2fe6c467e7df8823ac1071
--- /dev/null
+++ b/smash/web/templates/subjects/add.html
@@ -0,0 +1,52 @@
+{% extends "_base.html" %}
+{% load static %}
+
+{% block styles %}
+{{ block.super }}
+	<!-- DataTables -->
+  <link rel="stylesheet" href="{% static 'AdminLTE/plugins/datatables/dataTables.bootstrap.css' %}">
+{% endblock styles %}
+
+{% block page_title %}'newsubject'{% endblock page_title %}
+{% block page_header %}New subject{% endblock page_header %}
+{% block page_description %}adding{% endblock page_description %}
+
+{% block breadcrumb %}
+			  <li><a href="#"><i class="fa fa-dashboard"></i> Dashboard</a></li>
+			  <li class="active">Workers</li>
+{% endblock breadcrumb %}
+
+{% block maincontent %}
+
+%TODO: add adding
+
+{% block title %}{{object_name}} Form{% endblock %}
+
+{% block content %}
+<form action="" method="post">{% csrf_token %}
+<table>
+{{form}}
+</table>
+<input type="submit" value="Save {{object_name}}"/></form>
+{% endblock %}
+
+{% endblock maincontent %}
+
+{% block scripts %}
+	{{ block.super }}
+
+	<script src="{% static 'AdminLTE/plugins/datatables/jquery.dataTables.min.js' %}"></script>
+	<script src="{% static 'AdminLTE/plugins/datatables/dataTables.bootstrap.min.js' %}"></script>
+	<script>
+		$(function () {
+			$('#table').DataTable({
+			  "paging": true,
+			  "lengthChange": false,
+			  "searching": true,
+			  "ordering": true,
+			  "info": true,
+			  "autoWidth": false
+			});
+		});
+	</script>
+{% endblock scripts %}
diff --git a/smash/web/templates/subjects/index.html b/smash/web/templates/subjects/index.html
index c940c80e7ab1504b8c8983246888752c658100f8..659c315db89ffbf551f2b7eaf6cc67a5c07017a4 100644
--- a/smash/web/templates/subjects/index.html
+++ b/smash/web/templates/subjects/index.html
@@ -20,7 +20,7 @@
 
 <div>
 	<a class="btn btn-app">
-		<i class="fa fa-plus"></i> Add new subject
+		<a href="{% url 'web.views.subjectadd' %}"><i class="fa fa-plus"></i> Add new subject
 	</a>
 </div>
 
diff --git a/smash/web/urls.py b/smash/web/urls.py
index e4556be5571cdb8b39daea3bb68b11894cdef15c..066b9ae4c55e40121a88dc5d3c2273a5fb6428ef 100644
--- a/smash/web/urls.py
+++ b/smash/web/urls.py
@@ -19,6 +19,7 @@ from web import views
 urlpatterns = [
     url(r'assignments$', views.assignments, name='web.views.assignments'),
     url(r'subjects$', views.subjects, name='web.views.subjects'),
+    url(r'subjects/add$', views.subjectadd, name='web.views.subjectadd'),
     url(r'doctors$', views.doctors, name='web.views.doctors'),
     url(r'equipment_and_rooms$', views.equipment_and_rooms, name='web.views.equipment_and_rooms'),
     url(r'equipment_and_rooms/eqdef$', views.equipment_def, name='web.views.equipment_def'),
diff --git a/smash/web/views.py b/smash/web/views.py
index 4ff4ceea555c9b50b384f0b8f49a8529dec6f3b5..dc6ac3026acb23c3cf8f3000c160ed5e37454eeb 100644
--- a/smash/web/views.py
+++ b/smash/web/views.py
@@ -9,7 +9,7 @@ import auth
 def index(request):
 	if request.user.is_authenticated():
 		return redirect(assignments)
-	return redirect(login)	
+	return redirect(login)
 
 
 def login(request):
@@ -18,21 +18,21 @@ def login(request):
 	}
 	if request.GET and request.GET.get('error'):
 		context['state'] = request.GET.get('error')
-		
+
 	if request.method == "POST" and request.POST:
 		state = auth.do_login(request)
 		if state == True:
 			return redirect(assignments)
 		else:
 			return redirect('/login?error=' + state[1])
-	
+
 	return render(request, "login.html", context)
-	
-	
+
+
 def logout(request):
 	state = auth.do_logout(request)
 	return render(request, "login.html", {'state': state})
-	
+
 
 def assignments(request):
 	template = loader.get_template("assignments/index.html")
@@ -49,6 +49,11 @@ def subjects(request):
 
 	return HttpResponse(template.render(context,request))
 
+def subjectadd(request,CreateView):
+	template = loader.get_template("subjects/add.html")
+	model = Subject
+
+	return HttpResponse(template.render(model,request))
 
 def doctors(request):
 	doctors_list = Worker.objects.order_by('-lastName')