Overwrite any local changes in gh-pages branch, like gitignore switching, by choosing theirs as merge strategy
Add oop refactoring to include refactoring example in php organizing code chapter
Emphasize the idea of refactoring and link to the wiki page, in php code organization chapter
Merging 'master' into 'gh-pages'