Git test
pause and resume in view
Changed names in menu
Merge remote-tracking branch 'origin/engine' into development
Git test
Changed names in menu
menu updates
Merge remote-tracking branch 'origin/menus' into development
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.
start
start
Completely new menu system
spelling
Restructured collisiondetection
Changed menus
Changed in the menus again
Merge remote-tracking branch 'origin/engine' into development

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