Added line to Readme. Hopefully this doesn't conflict...
Fixed conflicts like a boss