Initial scaffolding commit
Merge branch 'master' of github.com:danyim/GitDemo

Conflicts:
	app/index.html