Create a conflict.
Merge branch 'new-super-feature' of https://github.com/notre-dame/all-about-git into new-super-feature

Conflicts:
	amy.txt