Merge branch 'master' of https://github.com/shai1312/fproj

Conflicts:
	proj/src/com/example/proj/EditProfile.java
2wqe

ewqewwqe
ewqewqe