gitingore change
Merge remote-tracking branch 'origin/julien'
Merge branch 'master' of https://github.com/arkkange/Trinity

Conflicts:
	src/unityProject/.gitignore