working on the middle
Merge

Conflicts:
	public/images/italy.jpg
	views/index.erb