latest change
Merge branch 'master' of https://github.com/sgoodwin10/inmed-cookbook

Conflicts:
	php/recipes/install.rb