reworking on image bug
merged with latest master
Images are functional without the use of paperclip
merged in latest master, resolved conflicts
Merge pull request #71 from JeuelyFish/images

Images