Local development before merge
Merge branch 'master' of github.com:gsmiro/vagrant

Conflicts:
	.gitmodules

Merging from HEAD