Changed multiplication in test.php
Merge branches 'newbranch' and 'master'