replaced template site
cleanup
Merge branch 'master' of github.com:mirrorspock/mirrorspock.github.io

Conflicts:
	index.html
merged