changes from branch1
changing readme from branch1
resolving conflict