Added vagrant hidden folder as ignored by git.
Merge remote-tracking branch 'origin/master'