Added an obstacle to be tested with collisions.
Merge branch 'master' into collisions

Conflicts:
	thegame/thegame/Bullet.cs
	thegame/thegame/Enemy.cs
Merge branch 'master' of github.com:timtheonly/group-project
fixed merge commit
collisons between player tank and obstacle
collisions between obstacles and bullets