Updated readme 2
Merge branch 'master' of https://github.com/AngrySnout/happyclient

Conflicts:
	README.md
Updated readme 2