Finished project

such as it is
Resolved team.html conflict
Merge remote-tracking branch 'origin/master'

Fixed conflict