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
moved multiple calls to randomseed to main
allow enemies to die in liquids
fixed a position bug in jive turkeys
gave them more variable motions as well as the ability to jump past walls
fixed turkey direction
Merge branch 'master' into HEAD

Conflicts:
	src/nodes/floor.lua
	src/player.lua
removed enemy maximum
Merge branch 'jive-turkeys-caleb' of https://github.com/NimbusBP1729/hawkthorne-journey into jive-turkeys-caleb-nimbus
Fixes a spawn point
Merge pull request #818 from jhoff/jive-turkeys-caleb-nimbus

Jive turkeys caleb nimbus