Sorry for the late ness, something came up and I didn't get to this until later than I thought. I also had some trouble setting up git on my desktop, but it should be working now
Merge remote-tracking branch 'upstream/master'