added xcode projet's files
Merge https://github.com/ExayDX/IMN430Tp3
initialisation of the conflict graph

reviewed by Steven
Merge pull request #1 from FrancoisBelanger/master

Conflict graph