before merge
after merge
Merge branch 'master' of https://github.com/zouster/app1
just updated
cleaned
Merge branch 'master' of https://github.com/zouster/app1
clean with roger new
all formatting done
fix manoj merge