assigned new icon to categories
fixed conflicts
Conflicts:
	app/models/article.rb
	app/views/users/_userprofile.html.erb
edited the git ignore to avoid loading local uploads
Merge branch 'master' of github.com:samuel-hill/ga-wdi-rss-project