Merge branch 'master' of github.com:astarael7/sample_app

Conflicts:
	README.md