i just added a class
Merge remote-tracking branch 'origin/accountInfo'

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