initial commit
Merge branch 'master' of https://github.com/catedrasaes-umu/vagrantweb

Conflicts:
	README.md