Added StaticServer
Fixed merge Conflicts