CompetitionBot2017 is forked from SeamonstersTemplate (see How We'll Be Using GitHub This Year). SeamonstersTemplate should be added as an upstream source - to do this, do git remote add upstream https://github.com/Seamonsters-2605/SeamonstersTemplate
.
Then, to merge any changes from SeamonstersTemplate, do:
git fetch upstream
git merge upstream/master