settings
Merge branch 'master' of https://github.com/zackniwa/ShowCrasher

Conflicts:
	.gitignore