Refactors flickr media query
Merge pull request #11 from jgoley/jonathan

Refactors flickr media query
Merge branch 'master' of github.com:jgoley/TIY-13_Swamp-Rabbit-Cycling-Team-3
Changes media query size
Merge pull request #12 from tbarth17/tommy

Changes media query size
Merge branch 'master' of github.com:jgoley/TIY-13_Swamp-Rabbit-Cycling-Team-3
Merge branch 'jonathan'

Conflicts:
	app/styles/_media-queries.scss
Merge branch 'master' into jonathan

Conflicts:
	app/styles/_main-content.scss