Initial Commit
erge branch 'master' of github.com:tribasuki/demo_app

Conflicts:
	.gitignore