Tested stuff <Bandile>
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git