changes to readme file by team2 to provoke merge conflict
merge conflict resolved