Merge pull request #3 from joshiejack/master

Rawr
Merge pull request #4 from joshiejack/master

Ketchup S'more
Merge pull request #5 from joshiejack/master

GODDAMNIT JOSHIE
Research Log!  Craft into research planks
GODDAMNIT JOSHIE
Merge pull request #8 from SpitefulFox/master

Research Logs craft into Research Planks