changed readme to md
fixed conflict maby