we are doing sth
Merge branch 'master' of https://github.com/franklinduan/myfirstgit

 we're using shell what was I thinking?
fix bug