master version of redme
adding amol to readme
merging master into amol
merging master into aashish, solved conflict