login/logout/signup functional
fixed merge conflicts
orig files added from merge