Added text to hopefully create a conflict
Merge branch 'master' of https://github.com/admilne/treehouse_learn_git

Conflicts:
	file2