Changed line 5 to get a conflict
Merge branch 'master' of https://github.com/ultrapants/cs310Test

Conflicts:
	test.py