Project merge
Merge branch 'master' of github.com:GamingRobot/steamgo

Conflicts:
	README.md