update
Merge branch 'master' of github.com:Namluu/php-web-developer

Conflicts:
	databases/mysql/mySQL.doc