add something about git
Merge branches 'demo' and 'master'