I changed the readme haha
fixed merge conflicts