added wildcards
merged search title and org into one and persist search filter
images now saved as 200 x scaled_height to take up less space
Merge pull request #23 from bspolley/master

Populator for Testing
Merge pull request #24 from bspolley/search

Search
Merge pull request #25 from bspolley/photo

Added scaling of photos
Merge remote-tracking branch 'upstream/master' into comment
comment box for denying project
remove dependency on rmagick in development environment, only needed in production now
Merge pull request #26 from bspolley/rmagick

Rmagick
added comment box for approval form, prettied up stuff with Helen's help
fixed project approval form and linked comment to mailer partial for approved projects