Updated some styles/fonts, added showroom gallery
Fixed merge conflicts

Conflicts:
	404.html
	about.html
	contact.html
	index.html
	services.html