Zaxzxzx
Merge remote-tracking branch 'origin/master' into gal
sdasdsaadsd
adfsd
gfdfsdfs
Merge remote-tracking branch 'origin/master' into gal

Conflicts:
	vcproject/bin/.gitignore
-reading from db login_controller
sdsds
sdsds
Merge branch 'gal' of https://github.com/VCPoject/VCPServer.git into gal
Merge remote-tracking branch 'origin/gal'

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
Merge remote-tracking branch 'origin/master' into Ofer

Conflicts:
	vcproject/src/clientServer/ClientConsole.java