logo and bodoni font
fixed conflicts

Conflicts:
	index.html