fixed login problems
Merge branch 'master' of github.com:jbsmith86/ment_or_ship