Merge branch 'master' of http://github.com/tyjajack/shark

Conflicts:
	js/game.js