Initial checkin
resolved readme conflict