new branch created for shadow
second branch created
test branch words added
conflict resolved
Merge branch 'master' of https://github.com/MurthySugumar/AngularBook into develop

Conflicts:
	first.txt
develope branch updated