working on organization login
Merge branch 'master' into ryan