Inital commit
Merge branch 'master' of github.com:xi4oh4o/sample_app

Conflicts:
	.gitignore