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
Merge pull request #9 from slkennedy/Sara-Branch

Places Google Map
adds phone and email styling
fixed conflict
adds multiple images to feed
Merge pull request #10 from jhath16/justin-branch

Image aspect ratios fixed
styles contact and footer
fixes conflicts
fixes conflicts
Merge pull request #11 from allanmonzon/allan-branch

Allan branch
adds footer border
Merge pull request #12 from allanmonzon/allan-branch

adds footer border
fixed conflict
heyhey
Merge branch 'master' of github.com:sbaldwin24/Operation-Piercing-Swamp-Rabbit into justin-branch
Adds new header image
Merge pull request #14 from jhath16/justin-branch

Image Header