conflict from Grace
Merge branch 'master' of https://github.com/dparise/git-talk

Conflicts:
	file2.py