Octopress init
Merge branch 'master' of github.com:Wolox/wolox.github.com

Conflicts:
	index.html
Site updated at 2014-11-05 14:36:46 UTC
post conco
Merge branch 'master' of github.com:Wolox/wolox.github.com into source