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
Merge remote-tracking branch 'upstream/master'
added last pull
edit, new, show and index all work
Merge pull request #11 from duanw/master

Added models, controllers, and views for Team