class added 'branchclass'
merge project
fixing wrong merg
removing unused bak
method added to branchclass