mod rewrite to htm
Merge branch 'chris' of github.com:chrislukic/sandpiper into jacklyn

Conflicts:
	.DS_Store