This is my first commit
Merge branch 'master' of https://github.com/akiryk/stratus

Conflicts:
	README.md