jsHint is yelling at me
Merge branch 'master' of github.com:gavinanderegg/coffeeQuest

Conflicts:
	js/main.js