minor change
Merge branch 'master' of github.com:aldem500/demo_app

Conflicts:
	.gitignore