-Not Working Places.
asasa
Merge branch 'master' of local repository into gal

Conflicts:
	vcproject/src/entity/Parking_Lot.java
	vcproject/src/gui/VCP_Main_Frame.java
jhghjghg
Merge branch 'master' of local repository into gal

Conflicts:
	OCSF/src/ocsf/server/MySqlConnection.java
	vcproject/src/controler/PricingController.java
	vcproject/src/entity/Parking_Lot.java
-FindAltParkingLot
Merge remote-tracking branch 'origin/gal'

Conflicts:
	OCSF/src/ocsf/server/MySqlConnection.java
	vcproject/src/controler/VcpInfo.java
	vcproject/src/entity/Parking_Lot.java