Added an enum for the different object types
Added use of the new enums in the object constructors
Added a lava platform that kills the player when touching
Big painful merge