nuovo file:   Vagrantfile
	nuovo file:   example.com/public_html/index.php
	nuovo file:   example.com/public_html/memcached.php
	nuovo file:   script/connect_puppet.sh
	nuovo file:   script/setting_con.sh
	nuovo file:   script/upgrade_apt.sh
	nuovo file:   script/upgrade_pe.sh
	nuovo file:   script/upgrade_puppet.sh
	nuovo file:   support/manifests/init.pp
Merge branch 'master' of https://github.com/alemazz/LEMP_VM

Conflicts:
	.vagrant/machines/default/virtualbox/id
	Vagrantfile
	script/setting_con.sh
	script/upgrade_pe.sh
	eliminato:    script/maria.sh
	eliminato:    script/pecl.sh