temporary direct root to index.html
reset
Merge branch 'master' of github.com:deanwenick/nfz
Merge branch 'zoie'

Conflicts:
	app.js
1. add user login feature
2. make filename no show