changed your function
Merge branch 'master' of https://github.com/bransingh/try-git

Conflicts:
	test.py