commit test
modify test.cpp
add int
change cc to 111
change cc to 222
conflict fixed
add gitignore