Merge branch 'master' of https://github.com/isaacwhite/4170-final-project

Conflicts:
	js/main.js
Merge branch 'master' of https://github.com/isaacwhite/4170-final-project