vagrant stuff
Merge branch 'master' of github.com:milinets/proj

Conflicts:
	Vagrantfile