more git tips
Merge branch 'master' of github.com:warwickhunter/play