fixing merge conflicts
Merge branch 'master' of https://github.com/mud-turtles-2014/TheSpot
update image size from api
add image size change to search results
change to squares
Merge pull request #23 from mud-turtles-2014/api-image-size

Api image size