Updated seed file
Updated .gitignore
Merge branch 'master' into styling

Conflicts:
	db/seeds.rb