added markdown version of README
merged local branches