initial commit
improved readme
Merge branch 'master' of https://github.com/pmastela/sample_app

Conflicts:
	.gitignore
	README.md