fixed comment
Merge branch 'master' of https://github.com/eudyptula/Encourage

Conflicts:
	client.h