Updated Collision

Added framework for future shapes to be added.
Added collision resolution methods (untested)