Full and final check in
Merge branch 'master' of https://github.com/yashoswal/272proj

Conflicts:
	Final272Project/model/happeningMain.js