Updates Version 1

first version of website, pending review from client
Merge branch 'master' of https://github.com/efuste/bullcityvet

Conflicts:
	contact.html
	css/styles1.css
	index.php
	oldsite/boxes.html
	oldsite/contact_no_map.html
	oldsite/full_width.html
	oldsite/home_service_boxes.html
	oldsite/home_static.html
	oldsite/side_column.html