Hopefully this works
Merge branch 'master' of https://github.com/pmsc73/cs3716.git
Not sure what happened here
Merge branch 'master' of https://github.com/pmsc73/cs3716.git