eh, removing the cat
Merge branch 'master' of github.com:rtortora/whalewatch

Conflicts:
	whales/cat