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
Adds Google Map and Adjusts Stylesf
Beautifies the CSS code
Merge pull request #8 from slkennedy/Sara-Branch

Adds Google Map and Adjusts Styling
fixed conflict
Fixed aspect ratio of resizing images
adds media query to display two images with scroll on 800px
pulls photos from flickr but displays three of the same
Places Google Map
Merge pull request #9 from slkennedy/Sara-Branch

Places Google Map
fixed conflict
adds multiple images to feed