Removed some git conflict left over
Merge branch 'master' of github.com:CardiffMathematicsCodeClub/CardiffMathematicsCodeClub.github.io into jekyll