branch add and file add to that branch
editfile star.cm
Merge branch 'master' of github.com:sivan89/123321 into smart
edit file star.h
love ever
Merge commit '1a501f8'