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

* 'master' of github.com:teatang/demo_app:
  Initial commit

Conflicts:
	.gitignore