updated carrierwave
Merge branch 'master' of github.com:samuel-hill/ga-wdi-rss-project

Conflicts:
	app/views/users/_form.html.erb
	app/views/users/_userprofile.html.erb
carrerwave upload working
Merge branch 'master' of github.com:samuel-hill/ga-wdi-rss-project