Modification de l'implémentation + création d'un Makefile (vide pour le moment)
Merge branch 'master' of https://github.com/JBCity/jbcity

Conflicts:
	deliverables/skeleton/src/com/jbcity/sim/com/jbcity/sim/city$$anonfun$init$1$$anonfun$apply$mcVI$sp$1.class
	deliverables/skeleton/src/com/jbcity/sim/com/jbcity/sim/city.class
	deliverables/skeleton/src/com/jbcity/sim/com/jbcity/sim/infras_commercial.class
	deliverables/skeleton/src/com/jbcity/sim/com/jbcity/sim/infras_entertainment.class
	deliverables/skeleton/src/com/jbcity/sim/com/jbcity/sim/infras_production.class
	deliverables/skeleton/src/com/jbcity/sim/com/jbcity/sim/infras_residential.class
	deliverables/skeleton/src/com/jbcity/sim/com/jbcity/sim/infras_security.class
	deliverables/skeleton/src/com/jbcity/sim/com/jbcity/sim/infras_social.class
	deliverables/skeleton/src/com/jbcity/sim/com/jbcity/sim/infras_transport.class
	deliverables/skeleton/src/com/jbcity/sim/com/jbcity/sim/infrastructure.class
	deliverables/skeleton/src/com/jbcity/sim/partie$.class
	deliverables/skeleton/src/com/jbcity/sim/partie.class