Finish
Merge branch 'master' of https://github.com/proeber/Final-Project

Conflicts:
	js/main.js