Merge branch 'master' of https://github.com/matthieupenchenat81/DreamPark

Conflicts:
	Developpement/DreamPark/.idea/workspace.xml
Merge branch 'master' of https://github.com/matthieupenchenat81/DreamPark

Conflicts:
	Developpement/DreamPark/.idea/workspace.xml
tcommit
Merge branch 'master' of https://github.com/matthieupenchenat81/DreamPark

Conflicts:
	Developpement/DreamPark/.idea/workspace.xml
test
Merge remote-tracking branch 'origin/master'

Conflicts:
	Developpement/DreamPark/Controler/__pycache__/HomeControler.cpython-34.pyc
	Developpement/DreamPark/Controler/__pycache__/__init__.cpython-34.pyc
	Developpement/DreamPark/Model/Parking/__pycache__/Parking.cpython-34.pyc
	Developpement/DreamPark/Model/Parking/__pycache__/Place.cpython-34.pyc
	Developpement/DreamPark/Model/Parking/__pycache__/__init__.cpython-34.pyc
	Developpement/DreamPark/Model/__pycache__/__init__.cpython-34.pyc
	Developpement/DreamPark/View/__pycache__/consumer_home.cpython-34.pyc
Merge branch 'master' of https://github.com/matthieupenchenat81/DreamPark

Conflicts:
	Developpement/DreamPark/.idea/workspace.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'