starting to build gameplay loop
Merge branch 'master' of https://github.com/mmconrad/airfare-faces
this is just after pulling some changes
Conflicts:
	public/js/main.js