Initial commit
Merge branch 'master' of github.com:Pelgrin/demo_app

Conflicts:
	.gitignore