testing fixes
gemfile conflict, simple rss cov
whitelisted image in user params
Add users seed with our email adresses
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
Fix users controller authorization
Merge branch 'samsam' of https://github.com/sammyjopeters/codium into sammyjopeters-samsam
delete binding.pry from users controller
fixed conflicts, spammy coverage files
Merge branch 'master' of https://github.com/epoch/codium

Conflicts:
	app/controllers/users_controller.rb
Merge pull request #57 from albertodotcom/master

Merge Sam changes
Merge branch 'master' into samsam
user profile styles