Changes media query and fixes flickr styles
Merge branch 'jonathan'

Conflicts:
	app/styles/_media-queries.scss