before scaffold
After adding user details with scaffold
adding vagrant related file
Merge remote-tracking branch 'upstream/master' into addVagrant