upload to github
Merge branch 'master' of github.com:metaplinius/square

Conflicts:
	README.md
upload to github