Added Vagrant file
Merge branch 'test'