Added more css to project
Fixed merge conflicts
fixed merge conflits