changes to readme file by team1 for merge conflicts