Fruits
fruits again
9.07 mar 6
v7
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/assets/stylesheets/bootstrap.css
	app/views/fruits/index.html.erb
	app/views/home/index.html.erb
	app/views/layouts/_footer.html.erb
	app/views/layouts/_header.html.erb
	app/views/vegetables/index.html.erb