Refector code and implement modal average#4

michaelik wants to merge 2 commits intodrmonkeyninja:masterdrmonkeyninja/phpunit-simple-example:masterfrom

michaelik:refactormichaelik/phpunit-simple-example:refactorCopy head branch name to clipboard