Signed-off-by: Haim <haimtzabar@gmail.com>


Signed-off-by: Haim <haimtzabar@gmail.com>
Merge branch 'master' of https://github.com/haimtz/FinalProject.git

Conflicts:
	src/il/co/moshavit/model/User.java