Initial commit
Merge branch 'master' of github.com:SpaceComby/SpaceComby

Conflicts:
	README.md