Merge branch 'jonathan'
Merge branch 'master' of github.com:jgoley/TIY-13_Swamp-Rabbit-Cycling-Team-3
Merge branch 'master' of github.com:jgoley/TIY-13_Swamp-Rabbit-Cycling-Team-3
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
Changes media query and fixes flickr styles
Merge branch 'jonathan'

Conflicts:
	app/styles/_media-queries.scss
Implements hammer.js swipe events to flickr images
Fixes background size of logo
Merge branch 'master' into jonathan

Conflicts:
	app/styles/_main-content.scss
Merge pull request #14 from jgoley/jonathan

Implements hammer.js swipe events to flickr images
Fixes swipe by removing ghost space
Merge pull request #15 from jgoley/jonathan

Fixes swipe by removing ghost space
Some progress, stashing to checkout master