small bug fix
Merge branch 'master' of github.com:daniellecs/project_craig
almost done with the img search results page - image formatting is tough
mostly conflict fixes, some small search page fixes
fixed merge conflicts