scratch cat added
Merge branch 'master' of https://github.com/dllu/bieber-drive

Conflicts:
	js/images.js