local changes
Merge branch 'master' of github.com:briandemant/myenv

Conflicts:
	bin/composer.phar