Here goes nothing
Merge remote-tracking branch 'origin/master'
Flag time
Merge branch 'master' of https://github.com/Smorgasfjord/VikingGame
Stupid Git