структура nginx+phpfpm
	modified:   README.md
	modified:   README.md
	modified:   README.md
	modified:   README.md
	modified:   README.md
Добавлены файлы puppet
Добавлена установка mysql
	modified:   initservice.sh
	modified:   puppet/init_mysql.pp
	modified:   README.md
	modified:   initservice.sh
	modified:   README.md
	modified:   README.md
temp
Merge branch 'master' of github.com:perec007/mml

Conflicts:
	initservice.sh
	puppet/init_mysql.pp
	modified:   README.md
	modified:   README.md