Merge pull request #1 from jhath16/justin-branch

Adds HTML layout
Adds JS and Underscore template - flickr API
Merge pull request #2 from slkennedy/Sara-Branch

Adds JS and Underscore template - flickr API
adds basic responsive structure
Merge pull request #3 from jhath16/justin-branch

adds basic responsive structure
Tweaks Flickr API - still not working
Fixes Flickr API
Fixes Flickr API
Merge pull request #4 from slkennedy/Sara-Branch

Tweaks Flickr API - still not working
Adds basic styling
Merge pull request #5 from slkennedy/Sara-Branch

Adds basic styling
removes white space  below images
adds responsize ability to pictures
changes picture media query size down to 600px
h2 and body fonts changed
styles footer
Merge pull request #6 from jhath16/justin-branch

Image merge
Merge branch 'master' of https://github.com/sbaldwin24/Operation-Piercing-Swamp-Rabbit into allan-branch
fixes conflict
Conflicts:
	app/styles/main.scss
Merge pull request #7 from allanmonzon/allan-branch

Allan branch