Added my teams page
fixed merge conflict in css
damn merge