Fixed new menu for main activity
Merge remote-tracking branch 'origin/NewMenu'

Conflicts:
	GitWarriorSolution/project.properties
	GitWarriorSolution/res/menu/main.xml
	GitWarriorSolution/src/com/example/gitwarriorsolution/MainActivity.java

TL;DR
Made an uber merge to envelope our lost changes again