implemented media queries
implemented mobile media query
Merge pull request #2 from chad-m/flickr-mobile

Flickr mobile
Merge remote-tracking branch 'upstream/master' into plove

Conflicts:
	app/scripts/main.js
	app/styles/main.scss