add new file newBranch.java to branch dev
test confilict
test conflict
conflict fixed
add a new attribute gender
merge from dev with --no-ff
add get method of age
add a get method
fix conflict
merge from dev