1. add user login feature
2. make filename no show
Merge branch 'master' of https://github.com/deanwenick/nfz

Conflicts:
	app.js