wok
Merge branch 'master' of github.com:gecampbell/xlerb.com

Conflicts:
	docroot/favicon.ico
	docroot/index.php