merging testframe with bomb fixes
Merge branch 'master' of https://github.com/zachuserid/bomberman
Merged in all submission stuff
removed class files from commit