conflict
Merge branch 'master' of https://github.com/Dontfearmistakes/CodeSchoolTest

Conflicts:
	cat.txt

Resolving conflict over cat.txt