syncing up and breaking (probs)
Merge branch 'master' of https://github.com/webcake/webcake.github.io

Conflicts:
	_harp/generator/index.jade