got rid of merge error
Merge branch 'gh-pages' of https://github.com/MissionBit/operation-peach into gh-pages

Conflicts:
	js/game.js
	js/resources.js