gitignore
Merge branch 'master' of https://github.com/LucieBa/Gclc

Conflicts:
	.gitignore