Solved a few problems
Merge branch 'master' of https://github.com/GravityScore/UNSW
Resolved conflicts