update
update Vagrantfile
Merge branch 'master' of github.com:tosmi/linuxwochen2014