commit
fix merge
add vagrant
commit