auth interceptor now only expects auth token. auth controller now generates tokens for staff
Merge branch 'master' of github.com:joubin/CSC191

merging kyles user changes to my auth changes
UserController now sets the password using the scrypt library