MOOC Full Stack
Merge branch 'master' of https://github.com/vaishaksuresh/cmpe275-Project2

Conflicts:
	MOOCClient/.DS_Store
	MOOCClient/MOOCClient/__init__.py
	MOOCClient/MOOCClient/settings.py
	MOOCClient/MOOCClient/urls.py
	MOOCClient/MOOCClient/wsgi.py
	MOOCClient/registeruser/.DS_Store
	MOOCClient/registeruser/__init__.py
	MOOCClient/registeruser/models.py
	MOOCClient/registeruser/templates/index.html
	MOOCClient/registeruser/tests.py
	MOOCClient/registeruser/views.py
	MOOCClient/static/.DS_Store