what on earth?
Merge branch 'master' of github.com:saltcod/waterstreetv6

* 'master' of github.com:saltcod/waterstreetv6:
  One more pre-christmas commit
  Pre-christmas commit.