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
fixed conflict
adds multiple images to feed
Merge pull request #10 from jhath16/justin-branch

Image aspect ratios fixed