thanksgiving turkey & npcs
Merge branch 'thanksgiving' into develop
thanksgiving: newstuff too
Merge remote-tracking branch 'upstream/develop' into develop