"Added local picture seed"
Update
Modified .gitignore
Merge branch 'master' into styling

Conflicts:
	db/seeds.rb
Merge branch 'styling'