Initial commit
Merge branch 'master' of https://github.com/alexfeeling/SwordWorld

Conflicts:
	README.md
Create README.md
first commit
Merge branch 'master' of https://github.com/alexfeeling/SwordWorld
test