shanti added
Merge branch 'master' of https://github.com/saasrobotics/learn_git

Conflicts:
	new.txt
Merge branch 'master' of https://github.com/saasrobotics/learn_git