test .idea/workspace.xml
test2
test
master
test4
Merge branch 'Gregory'

Conflicts:
	.idea/workspace.xml
Ajout gitignore
Merge branch 'master' of https://github.com/dpp972/Appolo into manco