Reformatting
Merge branch 'master' of https://github.com/PHPLondon/PHP-UK-Conference