updated README to more verbose (i.e. clear to newbies).
fixed merge conflict