adds login, logoff, sign up functions
adds login, logoff, sign up functions and a nice merge