ant added
Merge branch 'master' of https://github.com/robintema/LEMP

Conflicts:
	.gitignore
	Cheffile
	README.md
	data/composer.phar
	my_cookbooks/app/attributes/default.rb
	roles/vagrant.json