first start on turkeys
Merge remote-tracking branch 'upstream/master' into jive-turkeys
Merge remote-tracking branch 'upstream/master' into jive-turkeys
continued
Merge remote-tracking branch 'upstream/master' into jive-turkeys

Conflicts:
	src/nodes/enemy.lua
jive
work on turkey
Merge remote-tracking branch 'upstream/master' into jive-turkeys

Conflicts:
	src/nodes/enemy.lua
Use a GLSL shader for the transition
Fixes konami code
Update src/credits.lua
Merge pull request #782 from didory123/patch-1

Update src/credits.lua
Merge pull request #781 from bucketh3ad/cheat_fix

Fixes konami code
Transitions now work correctly
Show player respawn
Merge branch 'master' of github.com:kyleconroy/hawkthorne-journey
The new dialog boxes are coming along nicely
The new dialog boxes are coming along nicely
Blinky blinky
Prompt is all new and all pretty