read me
Merge branch 'master' of github.com:stasyanx/demo_app

Conflicts:
	README.md