Bird's commit
Merge branch 'master' of https://github.com/CharlesLillo/catswithhats

Conflicts:
	README.md
Merge branch 'master' of https://github.com/CharlesLillo/catswithhats
Merge branch 'master' of https://github.com/CharlesLillo/catswithhats