Still spazzy...
Merge branch 'master' of https://github.com/Rickles/powerhorses-hackathon-01-2013

Conflicts:
	js/game.js