switched to flickr for cats
Merge branch 'master' of github.com:ben-hudson/purrbble

Conflicts:
	src/js/pebble-js-app.js