readme
Merge branch 'master' of github.com:scald/gooooooool

Conflicts:
	README.md