Ignores
Merge branch 'master' of https://github.com/Seth-willis/NaturalCatchdev

Conflicts:
	.gitignore
Ignores