testing fixes
gemfile conflict, simple rss cov
whitelisted image in user params
Merge pull request #55 from albertodotcom/master

Add users seed with our email adresses
Merge pull request #54 from MollyMoile/marcus

whitelisted image in user params
delete binding.pry from users controller
Merge branch 'master' of https://github.com/epoch/codium

Conflicts:
	app/controllers/users_controller.rb