lol
lol
Merge branch 'master' of https://github.com/dimsum12/Parking

Conflicts:
	Clavier.cpp