Pavel Assessment
Merge branch 'master' of github.com:pavelsmolka/flock

Conflicts:
	src/bin/assess.php