Cleaned source directory.
Fixed Map errors by replacing Obst with Surface.
Implemented color areas in Surface.
Merged by using local