Merge remote-tracking branch 'origin/master'

Conflicts:
	Php/PHP/newfile.php
Merge branch 'master' of https://github.com/arthurferroni/php