changed stuff
fixed conflict on READM.ME