omg, i didnt' commit all day
creating, editing, deleting markets all functional
resolved merge conflicts