Merge branch 'gh-pages' of https://github.com/iqlabs/daddyo-www into gh-pages

Conflicts:
	data/development/content.json