psr-4
php-cs-fixer --level=all fix
fix conflict
Merge pull request #1 from dominikzogg/master

psr-4 cs-fix