Merge branch 'master' into collisions

Conflicts:
	thegame/thegame/Bullet.cs
	thegame/thegame/Enemy.cs
Merge branch 'master' of github.com:timtheonly/group-project