ignore
Merge branch 'master' of https://github.com/spidamoo/sod.git

Conflicts:
	.gitignore
effect