Moving site
Merge branch 'master' of https://github.com/jribe/jribe.github.io

Conflicts:
	index.html
Clean-up