adding exam function
Checking Git plug-in from WebStorm
Checking Git plug-in from WebStorm
Checking Git plug-in from WebStorm
Adding Authentication Service
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/courses.html
	src/main/webapp/exam.html
	src/main/webapp/index.html
	src/main/webapp/js/custom.js
	src/main/webapp/newsandviews.html
	src/main/webapp/partials/exam/partial_instruction.html
	src/main/webapp/partials/exam/partial_startExam.html