update committed files
.
Merge branch 'master' of https://github.com/Maiteh/php_project