send passwd
Merge branch 'develop' of github.com:afitterling/rails4base into develop
Merge remote-tracking branch 'upstream/develop' into develop