added models, tests, controllers for team, still haven't added supertest
fixed mongodb too large problem
fixing conflicts
trying to figure out bcrypt
added controllers and views
added controllers and views
fixing conflicts
added routes
reset last commit
adds a mailer and nodemailer is added to package.json
mailer works
Merge remote-tracking branch 'upstream/master'
added last pull
updates to mail allowing you to manually enter sender, reciever, message body and message subject
fixes update to check validations
adds error message to edit page
edit, new, show and index all work
fixed the edit in users, and also need to implement better password change
Merge pull request #10 from loganwatanabe/master

Family model, controller, and tests
Merge pull request #11 from duanw/master

Added models, controllers, and views for Team