added game over & collision for serenity
added gameover and collision for serenity
Merge branch 'master' of https://github.com/hackphx-html5games/team7

Conflicts:
	game.js
	images/bullet.png
	images/serenity.png
	images/space2.jpg
	images/start.png
	index.html