Stick waves back in
Merge branch 'overworldupdate' of git://github.com/edisonout/hawkthorne-journey into tester