Fixed a tag in html
San Francisco house cat
Added Kitten Ipsum
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'neverbendeasy/master'

Conflicts:
	index.html