Merging Andrew's changes with mine.
Merge commit '366b4c7aa7a25c170d239c348f234d5a7697d2a2' into drewstuff
Layout fixes to add marks page.
Merge branch 'master' of https://github.com/lockan/Group5Repo into drewstuff