ignore
Merge branch 'master' of github.com:TBaudon/waxe

Conflicts:
	.gitignore