Changes
Merge branch 'master' of https://github.com/PatrickNiedzielski/fb-hackathon-2013-11-21
Merge branch 'master' of https://github.com/PatrickNiedzielski/fb-hackathon-2013-11-21
Changes
Merge branch 'master' of https://github.com/PatrickNiedzielski/fb-hackathon-2013-11-21

Conflicts:
	src/game.html
Merge branch 'master' of https://github.com/PatrickNiedzielski/fb-hackathon-2013-11-21
Merge branch 'master' of https://github.com/PatrickNiedzielski/fb-hackathon-2013-11-21
Merge branch 'master' of https://github.com/PatrickNiedzielski/fb-hackathon-2013-11-21
Merge branch 'master' of https://github.com/PatrickNiedzielski/fb-hackathon-2013-11-21
Lots of changes that are awesome
Merge branch 'master' of https://github.com/PatrickNiedzielski/fb-hackathon-2013-11-21
Various gameplay changes