Pouya and Andrew worked together to fix marks add/display.
Merge branch 'master' of https://github.com/lockan/Group5Repo