Added getting teams from website
Merged files