Merge branch 'julianpoy-master'
Put team JSON in controller.
Put team CSS at bottom of main.scss and format it like the rest of the CSS.