add a new method
nothing
add file branchtest.m
add branchtest.m
branchtest.h is edited
modifed on branch dev
modifed on branch master
conflict fixed
add a new line
add a new line
add a new line
Merge branch 'master' of https://github.com/TomatoLovePotato/test