jhgjhj
s
Merge branch 'master' of https://github.com/VCPoject/vcproject.git

Conflicts:
	src/vcproject/LogIn_Panel.java
sfdasdasd
Merge remote-tracking branch 'origin/Ofer'
Merge remote-tracking branch 'origin/Ofer'

Conflicts:
	src/vcproject/LogIn_Panel.java.orig
-merge with ofer
-Check in frame