added vagrant file
merge conflict