start
gitignore
Merge branch 'master' of github.com:knownasilya/sword

Conflicts:
	.gitignore
	README.md