still working on items and respawn
added new files
Merge branch 'develop' of https://github.com/ayaigame/ayai-backend into item-messages
aefsa
Stop including swap files, Jarrad
errors
Merge branch 'develop' of https://github.com/ayaigame/ayai-backend into item-messages
added restored health
added respawning
collision editing (still need fixing)
Merge pull request #49 from ayaigame/item-messages

Item messages
added blank Dead component
addeed state and dead
npc change, keeping json files in sync
Merge branch 'item-messages' of https://github.com/ayaigame/ayai-backend into item-messages

Conflicts:
	src/main/scala/ayai/components/Respawn.scala
	src/main/scala/ayai/systems/HealthSystem.scala
	src/main/scala/ayai/systems/RespawningSystem.scala
added new actions and rearranged how movable is implemented
Merge branch 'develop' of https://github.com/ayaigame/ayai-backend into item-messages

Conflicts:
	src/main/scala/ayai/components/Dead.scala
ECS update
Merge pull request #50 from ayaigame/item-messages

Item messages
Improved Quadtrees and fixed double collision check
Merge branch 'develop' of github.com:ayaigame/ayai-backend into improved-quadtrees
Merge pull request #51 from ayaigame/improved-quadtrees

Improved quadtrees