[WIP] Merge demo branch into master branch

[promet99]

git checkout demo git merge --squash master Do your work commit -am "Insert what you did" && git push