git ignore
Merge branch 'master' of https://github.com/nicodeur/trombizz

Conflicts:
	.gitignore