cc
Merge branch 'master' of https://github.com/fofore/fofore.github.com

Conflicts:
	_layouts/default.html