began work on newTeamModalCtrl
Merge branch 'master' of http://github.com/benjaminjnoack/simian
small
Merge branch 'master' of http://github.com/benjaminjnoack/simian

Conflicts:
	client/app/controllers/team/teamCtrl.js