Some code style fixes & renamed phpunit.xml to phpunit.xml.dist & removed composer.lock
Merge branch 'master' of github.com:66Ton99/environment into ton