made change 2
change 3
making change 4
now making change 5
now making change 5
now making change 7
in synch
change1
change2
change3
Merge branch 'branch1' of https://github.com/ash261080/testgitrepo into branch1

Conflicts:
	init.txt