Halfway done with BookMacster 1.18.
Just trying to make git stop giving me stupid errors.
Merge remote-tracking branch 'origin/master'