Added new user flow, upload, share, preferences
Merge branch 'master' of https://github.com/laurajg/147Project

Conflicts:
	node/app.js