initial commit
readme
fix conflitcs