Story Bug Fixes
Merge branch 'develop' of https://github.com/StirfireStudios/ggj2014 into develop