Octopress init
Merge branch 'master' of https://github.com/ProctorCam/ProctorCam.github.io

Conflicts:
	index.html