Aman's second commit (edited test1.py)
Merge branch 'master' of https://github.com/GPCollab/testrepo

Conflicts:
	test1.py
	test2.py