Readme changes
Merge conflict on readme yay