Reformat.
Merge branch 'master' of github.com:ontario/zend-ogame
Merge branch 'master' of github.com:ontario/zend-ogame