push
Merge branch 'master' of https://github.com/glovenone/languages

Conflicts:
	php/strtotime.php