Chef and Vagrant
gitignore and chef
Merge branch 'master' of github.com:dkoudlo/myVagrantBox

Conflicts:
	.gitignore