Initial commit
Improve the README
Merge branch 'master' of github.com:flashbag/sample_app

Conflicts:
	.gitignore
	README.md
	.git/MERGE_HEAD