Revert ""

This reverts commit c46a34e37ea70fafe4cf03f644c1de2eefac304a.
Revert ""

This reverts commit 587c1f4ad6304ee466f51e75d701fe0a21e8d53d.
Merge branch 'master' of github.com:qucc/phpchapter6.git