git pracs
Merge upon local changes before pull Merge branch 'master' of github.com:bluebone29/tips