Edit phpcs for mac
Merge branch 'master' of github.com:ruimashita/.emacs.d

Conflicts:
	init.el