testing fixes
gemfile conflict, simple rss cov
whitelisted image in user params
Merge pull request #54 from MollyMoile/marcus

whitelisted image in user params