.
.
adding snippets
adding chef stuff
Merge branch 'master' of github.com:martin2110/.janus

Conflicts:
	.gitmodules