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

Conflicts:
	.gitignore