Merge remote-tracking branch 'origin/dillon' into manfred
dillon merge
conflict fix
dillon adding styles to team and meet phil page