commit 1a
Merge branch 'master' of https://github.com/bencassie/Test

Conflicts:
	Cat.txt