branch teest
& simple
and simple
conflict fixed
add git ignore files format
add file format ~