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

Conflicts:
	README.md