third commit via phpstorm
third commit via phpstorm 12
remove it
Merge branch 'master' of https://github.com/vseva/rosa

Conflicts:
	README.md