deleted:    ../.directory
	deleted:    .idea/workspace.xml
Merge branch 'master' of https://github.com/ziellim/Mayor-Pro

Conflicts:
	application/.idea/workspace.xml
	modified:   deliverables/architecture/model_dc.png
Merge branch 'master' of https://github.com/ziellim/Mayor-Pro

Conflicts:
	application/.idea/workspace.xml
	application/src/main/scala/com/paris7/mayorpro/business/Game.scala
	application/src/main/scala/com/paris7/mayorpro/model/Platform.scala
	modified:   README.md
	new file:   deliverables/architecture/business_dc.png