add calc
mod main.py
fix conflict
add
add help
merge
hi
mod
Merge branch 'test2'