Changed the names of Obstacle classes to 'Entity' classes.  Made Player class, inherits from Entity for convenience.