gitignore
Merge branch 'master' of https://github.com/FPierre/gladiator

Conflicts:
	.gitignore