changed README again to teach mhenke10 about merge conflicts
Fixed merge conflicts with Readme