update
added readme
fixed merge conflicts