added some basic instructions to readme
resolved conflict in readme