testBranch2 created
added 'int i' as instance variable
I think I successfully merged testBranch2 and master
I think testBranch2 has been merged with master and now I commit the merge.