vendor/cakephpが消えてしまう件の対処
Merge remote-tracking branch 'remotes/origin/master' into work

Conflicts:
	vagrant/provision.sh
共有ディレクトリをrsyncに変更
Plugin/をgitignoreに追加
Merge pull request #1 from tektoh/work

vendor/cakephpが消えてしまう件の対処