merging with master, resolved merge conflicts
removed functionality for resource images paperclip & added to views for resources
final commit, now pull request
deleted old images pre-S3 config
merged with master
committing changes from master
images uploading and viewable, pdfs uploading but not viewable
can link to image on resource
pdf and image links open in new tab
multiple document types validated and tweaked views and
fixed show page to have labeled links to uploaded documents
Merge pull request #24 from mbetts7/paperclip_v4

Paperclip v4