Merge branch 'master' of redbird.cs.umanitoba.ca:projects/empathy