edit dikit
Merge branch 'master' of https://github.com/sharonrh/Gamma

Conflicts:
	Project/src/view/EditProfilActivity.java