added specified by john
merging branches ...
Merge branch 'master' of github.com:patelkrunal/Git_Tutorial

Conflicts:
	file1.py