Adding Flickr
Merge remote-tracking branch 'origin/master' into snippets

Conflicts:
	flickr-backbone/js/script.js
	flickr/js/scripts.js
Removing Junk