user1
Merge branch 'master' of https://github.com/bazalt/clermont

Conflicts:
	README.md