Working flow for registration via fitbit
Merge remote-tracking branch 'upstream/master' into fitbit_reg

Conflicts:
	routes.js
	views/users.hjs
Merge pull request #7 from ddunlop/fitbit_reg

Working flow for registration via fitbit