Fixes.
Merge branch 'master' of git@github.com:kmorin1/CMPUT415-DashAB.git