Merge branch 'master' of github.com:codio/crafted.io

Conflicts:
	css/main.css
	index.html
	less/basics/body.less