Walking skeleton
Merge branch 'master' of https://github.com/jsnape/draco

Conflicts:
	.gitignore