Git test
Changed names in menu
documentation and minor changes
mini game

The player ship will go where you touch the screen and when you collide
with an enemy the enemy will die and you will receive points. The level
lasts for 1 minute.
Restructured collisiondetection
Merge remote-tracking branch 'origin/engine' into development

Conflicts:
	src/com/spaceshooter/game/menu/MenuActivity.java
Updated merge