bug fix
Merge branch 'master' of https://github.com/whiterson/mockingJay
Craft & Scavenge finally work. Finally. Heavens.
merge