Message
Merge branch 'master' of https://github.com/Niggins/COMP3431-Assignment1
Almost working...