Initial commit
Merge branch 'master' of https://github.com/blackdidi/sample_app

Conflicts:
	README.md