composer アップデート
Merge branch 'master' of github.com:dekokun/gistPHP

Conflicts:
	composer.phar