commit
Merge branch 'master' of https://github.com/jinmoku1/quix-plain

Conflicts:
	Client/HelloWorld.xcodeproj/project.pbxproj
	Client/www/index.html