-update to last known
-V2
jhjhjjhjh
Merge remote-tracking branch 'origin/master' into gal

Conflicts:
	vcproject/src/clientServer/ClientConsole.java
	vcproject/src/controler/LogIn_controller.java
-update some stuff
Merge branch 'master' of https://github.com/VCPoject/VCPServer

Conflicts:
	vcproject/bin/.gitignore
Merge remote-tracking branch 'origin/Ofer'

Conflicts:
	OCSF/bin/ocsf/server/EchoServer.class
	OCSF/bin/ocsf/server/MySqlConnection.class
	OCSF/src/ocsf/server/MySqlConnection.java
-not important
Merge branch 'master' of https://github.com/VCPoject/VCPServer.git

Conflicts:
	vcproject/src/controler/LogIn_controller.java
Merge remote-tracking branch 'origin/gal'

Conflicts:
	vcproject/src/controler/LogIn_controller.java
	vcproject/src/gui/VCP_Main_Frame.java
Merge remote-tracking branch 'origin/Haim'

Conflicts:
	vcproject/bin/gui/VCP_Main_Frame$1.class
	vcproject/bin/gui/VCP_Main_Frame$10.class
	vcproject/bin/gui/VCP_Main_Frame$11.class
	vcproject/bin/gui/VCP_Main_Frame$2$1.class
	vcproject/bin/gui/VCP_Main_Frame$2$2.class
	vcproject/bin/gui/VCP_Main_Frame$2$3.class
	vcproject/bin/gui/VCP_Main_Frame$2$4.class
	vcproject/bin/gui/VCP_Main_Frame$2.class
	vcproject/bin/gui/VCP_Main_Frame$3.class
	vcproject/bin/gui/VCP_Main_Frame$4.class
	vcproject/bin/gui/VCP_Main_Frame$5$1.class
	vcproject/bin/gui/VCP_Main_Frame$5.class
	vcproject/bin/gui/VCP_Main_Frame$6.class
	vcproject/bin/gui/VCP_Main_Frame$7.class
	vcproject/bin/gui/VCP_Main_Frame$8$1.class
	vcproject/bin/gui/VCP_Main_Frame$8.class
	vcproject/bin/gui/VCP_Main_Frame$9$1.class
	vcproject/bin/gui/VCP_Main_Frame$9.class
	vcproject/bin/gui/VCP_Main_Frame.class
	vcproject/src/gui/VCP_Main_Frame.java
-fix errors merge Haim
Merge branch 'master' of https://github.com/VCPoject/VCPServer.git
Merge remote-tracking branch 'origin/master' into Ofer
-add employee and parking lot panel