First commit
Merge branch 'master' of https://github.com/bbqcode/space-type

Conflicts:
	.gitignore