Teaching Assistants Project
Merge https://github.com/MarkFouche/cos301_2014_g3