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
Update newsandviews.html

Removed OAuth code
adding exam function
adding exam function
adding exam function
hello js and courses section from json
Changes in Service to make inline function calls
Merge remote-tracking branch 'origin/master'
Done with google login and all the interaction and courses page
Few more cosmetic changes
Few more cosmetic changes
Few more cosmetic changes
added jquery cookie js and completed all flow of social signin
added jquery cookie js and completed all flow of social signin
Corrected new and views section Removed Jquery Layout