changed stuff
fixed conflict on readme.md Phil did stupid change remotely and I had to get rid of them