user auth
Merge branch 'kz'
user auth set up
user auth set up, ignore DS_Store
user auth set up, ignore DS_Store