Merge branch 'chris' of github.com:chrislukic/sandpiper into jacklyn

Conflicts:
	.DS_Store
removed base href and updated about, contact
Merge branch 'jacklyn' of https://github.com/chrislukic/sandpiper into chris