Setup (suite... et fin ?)
Merge branch 'master' of https://github.com/wario4/gics

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/wario4/gics