init
Merge branch 'master' of github.com:micmro/Vagrant-play

Conflicts:
	.gitignore
	README.md