added teams

+teams
Merge remote-tracking branch 'origin/master'

Conflicts:
	gamemodes/Team/gamemode/init.lua
Revert "added teams"

This reverts commit 3ee83a7ce6e77d75c69bc1c74c6ff1cb7e441501.

Conflicts:
	gamemodes/Team/gamemode/init.lua