Initial commit
Initial commit

Merge branch 'master' of http://github.com/hyper1/demo_app

Conflicts:
	.gitignore