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

Conflicts:
	.gitignore