Merge conflict fixed.
Merge branch 'master' of https://github.com/erikduvet/GitWarriors.git

Conflicts:
	GitWarriorSolution/project.properties
	GitWarriorSolution/res/layout/activity_main.xml