Merge branch 'Lee'

Conflicts:
315-project.css
CMPT-315.html