Initial commit
Improve README
Merge https://github.com/kniarzyn/sample_app

Conflicts:
	README.md

 All conflicts fixed but you are still merging.