php-mode -> web-mode
add markdown-mode
Merge branch 'master' of github.com:katsusuke/emacs-settings

Conflicts:
	.emacs.el