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

Conflicts:
	.DS_Store
Merge branch 'jacklyn' of https://github.com/chrislukic/sandpiper into chris
Moving logo around in nav
Merge branch 'chris' of github.com:chrislukic/sandpiper into jack
Updates homepage, affix styles