conflict line 3

let's make a conflict on line 3
Merge branch 'master' of https://github.com/ultrapants/cs310Test

Conflicts:
	test.py