commit
revert changes
Merge branch 'ollie'

Conflicts:
	app/index.html
Merge branch 'master' of github.com:olliegill/Constructors-game

Conflicts:
	app/index.html
implemented second health bar
added 2nd health bar and change character images on select
victory and game over screens
Merge pull request #5 from chad-m/game-v03

Game v03
Merge remote-tracking branch 'origin/master' into ollie
big merge