initial commit
Merge branch 'master' of https://github.com/yipyip/pygoblinia

Conflicts:
	.gitignore