changed stuff
fixed conflict on readme.md. GErry did stupid changes emotely and I Had to get rid of them