Initial Commits
Merge branch 'master' of github.com:henrywoo100/demo_app

Conflicts:
	.gitignore