Fixed new menu for main activity
Git .i.
Git .i. #2
git .i. #3
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
Merge conflict fixed.
Merge branch 'master' of https://github.com/erikduvet/GitWarriors.git

Conflicts:
	GitWarriorSolution/project.properties
	GitWarriorSolution/res/layout/activity_main.xml
Added ribbon library
added some changes to the editaccount
Merge branch 'master' of https://github.com/erikduvet/GitWarriors.git

Conflicts:
	GitWarriorSolution/src/com/example/gitwarriorsolution/EditAccount.java
Merge branch 'master' of https://github.com/erikduvet/GitWarriors into
kostas

Conflicts:
	RibbonMenu-master/library/.settings/org.eclipse.jdt.core.prefs