test commit
Merge branch 'master' of https://github.com/dimsum12/Parking.git

Conflicts:
	bin/Parking