ignore
sdfa
Merge branch 'master' of https://github.com/lukefiorante/painteypete

Conflicts:
	.gitignore