Adding combat.js
Merge branch 'master' of https://github.com/ozten/Roguelike
merging some changes I made and pulling new code down.
resolving merge conflicts