lifebar
Merge branch 'master' of https://github.com/tpham93/SpaceLetters

Conflicts:
	SpaceLetters/SpaceLetters/Game/Entity/Player.cs
	SpaceLetters/SpaceLetters/Game/Weapon/Cannon.cs