Initial commit
Change the README
Merge branch 'master' of https://github.com/alexkonrad/sample_app_4_0

Conflicts:
	README.md