Changed collision

Now collision will be a part of every entity - the difference is that
there will be one vector of boxes external to the entities that the
individual collision instances will access via private pointer.