Merge branch 'master' of github.com:rfkrocktk/docker-vagrant-playground
Ignoring .vagrant.
Merge branch 'release/1.0.0'

Conflicts:
	.gitignore