commit initial
conflict over README removed