final

everything works properly
Merge branch 'master' of https://github.com/troychurch/hot-or-cold-starter

Conflicts:
	js/app.js