Added student info for 4 students
Merge pull request #1 from montricher/master

Added student info for David, Dara, Joe and Joel to seed file
Merge branch 'master' of github.com:johntrandall/ga-wdi-string-showcase
Merge branch 'dev'
added rails12factor to gem file
Merge branch 'dev'
added rails12factor to gem file
Merge branch 'dev' of github.com:johntrandall/ga-wdi-string-showcase into dev

Conflicts:
	Gemfile
Merge branch 'dev'
adding Gemfile lock
fixed typo in seed
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