initial commit
Merge https://github.com/mikeliu89/demo_app

Conflicts:
	.gitignore