add php-align
change crlf in init.el
Merge branch 'master' of github.com:rocky6122000/dot.emacs

Conflicts:
	init.el