gitignore
Merge branch 'master' of https://github.com/wwhere/workings-of-fate

Conflicts:
	.gitignore