Test branch

ch1 added to testBranch branchFile.php and then merged with master