update
Merge branch 'master' of github.com:Odinman/ogo

Conflicts:
	README.md