for alex
Merge branch 'master' of https://github.com/LostBalloon1/ggj13

Conflicts:
	TheGame/Assets/Classes/Projectile.cs