icons
icons
colors
colors
colors
colors
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	app/assets/stylesheets/application.css
	app/views/general/_featured.erb
	app/views/general/item.html.erb
merge