Merge pull request #43 from cptcaveman/gcyoshi13

Gcyoshi13
hella changes bro - added music files, edited damageable.cs bug, edited function of Beatmanager so that its more integrated with the project
merge conflicts for playerman and tile man
lalafafa
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
Player blocked by enemy implementation