Resolved merge Conflicts, Cleaned editor

cleaned up some code in the editor and merged Isaac's collision code
(still need Tile Collisions.h/cpp)