Merge pull request #9 from alexdinu18/master

Bug with Enemy Fixed
Added lifebar
Updated lifebar
Merge remote-tracking branch 'upstream/master'

Conflicts:
	GameShell.cpp
	Player.cpp
	lifebar.bmp