init
Merge branch 'master' of github.com:gerbsen/sample_app

Conflicts:
	.gitignore