readme for dev
Feature1
Feature 2 from master
conflict fixed