added vagrant
Merge branch 'master' of github.com:tikalk/fullstack-workshop
Merge branch 'master' into step1
Merge branch 'step1' into step2