resyncing branches
Merge branch 'master' of https://github.com/RitaDallara/zoo

Conflicts:
	app/views/pages/game.js.erb
	app/views/pages/game.js.erb~
	app/views/pages/home.html.erb

merging with logo and game JS
merge done
game engine working