add vagrantfile
Merge branch 'staging'