GlyphGryph/TeamJurassicPancake — pull request #3 by willmightprogram (2014-06-29 00:39:45+00:00)
Title: Merge remote-tracking branch 'origin/master'

Conflicts:
src/game.js
src/scenes.js