adding all of the stuff
Merge branch 'master' of https://github.com/ConorOSullivan/ConorOSullivan.github.io
hi