adding my 1st commit, adding my name to readme
merging master into aashish, solved conflict