Here the actual changes.
Changed config db location
Added __name__ to application.py
Merge branch 'master' of https://github.com/umarmiti/COMP-4350--Group-8

Conflicts:
	cris/course/controller.py
	cris/templates/layout.html
	templates/index.html
Merged aws-issue back in.