made methods for getting pictures from panoramio api
 updated seed file to grab images
fixed merge conflickts in seed file
 Fixed mere conflict in gemfile
Renamed file named index.html in public folder
removed broken/unfinished tests
updated seed file to take less images, and do fewer api calls
Merge pull request #14 from LasseSviland/master

added methods for getting images from panoramio
Fixed merge conflict in seed file