MAJ snippets PHP
Merge branch 'master' of github.com:YannickDa/vim

Conflicts:
	UltiSnips/php.snippets