Merge pull request #44 from cptcaveman/Peter

Peter
starting combat for player and enemies
adding util function to find the distance between two tile  positions
Merge branch 'master' into saltymccloud
fixing conflict in tileman code
Merge pull request #45 from cptcaveman/saltymccloud

Saltymccloud
Updated BeatManager to loop track layers, also changed prefab DJ_LevelMusic to DJ_BeatManager
renaming of DJ_LevelMusic to DJ_BeatManager
BeatManager