initial commit
finish demo app
Merge branch 'master' of github.com:zack6595/demo_app
done
Conflicts:
	.gitignore
Merge branch 'master' of github.com:zack6595/demo_app
merge finished
erge done