nicknames and emails
Merge branch 'master' of github.com:railsrumble/r14-team-373