Added API for updating team
Merge branch 'master' of https://github.com/ericapadilla/testRepo

Conflicts:
	config/routes.js