README added
merging branches