reorg
Merge branch 'master' of https://github.com/adamfg/adamfg.github.com

Conflicts:
	index.html