Initial commit
Merge https://github.com/jamadiedo/sample_app

Conflicts:
	.gitignore
	Gemfile.lock