added some changes to the editaccount
Merge branch 'master' of https://github.com/erikduvet/GitWarriors.git

Conflicts:
	GitWarriorSolution/src/com/example/gitwarriorsolution/EditAccount.java