background
json debug
Merge branch 'master' of https://github.com/dericko/Flickr-photosearcher

Conflicts:
	script.js