Cats v dogs

Attempt 1
Merge branch 'master' of https://github.com/amyszatkowski/amyszatkowski.github.io

Conflicts:
	homework/index.html