created icons
Merge branch 'JR_adding_images_to_pipeline' of github.com:johntrandall/ga-wdi-string-showcase into JR_adding_images_to_pipeline
Merge branch 'JR_adding_images_to_pipeline' of github.com:johntrandall/ga-wdi-string-showcase into JR_adding_images_to_pipeline

Conflicts:
	db/seeds.rb

Fixed conflicts. Seed works
fixed icons
Merge branch 'JR_adding_images_to_pipeline' of github.com:johntrandall/ga-wdi-string-showcase into JR_adding_images_to_pipeline