merge Ms user/login work with my structure
Merge branch 'master' of https://github.com/forcvnp/conservancybird.org