Octopress init
Merge commit '118bb64e9d426ff7dacbd3517a5eecc9d35f84c0' into source

Conflicts:
	index.html