main
Merge branch 'master' of https://github.com/Casket/marsh-game-files
Merge branch 'master' of https://github.com/Casket/marsh-game-files
Merge branch 'master' of https://github.com/Casket/marsh-game-files
Merge branch 'master' of https://github.com/Casket/marsh-game-files
Merge branch 'master' of https://github.com/Casket/marsh-game-files
you can now kill combat types like rambo sheep
added more to the damage calculation