eliminato:   .vagrant/.DS_Store
	eliminato:   .vagrant/machines/.DS_Store
Remove the now ignored directory "some-directory"
	eliminato:   .vagrant/.DS_Store
	elimnato:   .vagrant/machines/.DS_Store
	eliminato:   .vagrant/machines/default/virtualbox/id
Merge branch 'master' of https://github.com/alemazz/lamp_develop

Conflicts:
	README

	eliminato:    README