added the user story theme
Merge remote-tracking branch 'origin/BranchTheme'

Conflicts:
	GitWarriorSolution/AndroidManifest.xml
	GitWarriorSolution/res/layout/activity_main.xml
	GitWarriorSolution/res/layout/layout_edit_account.xml
	GitWarriorSolution/res/layout/layout_registration.xml
	GitWarriorSolution/src/com/example/gitwarriorsolution/EditAccount.java
Merge branch 'master' of https://github.com/erikduvet/GitWarriors.git

Conflicts:
	GitWarriorSolution/res/layout/activity_main.xml