s is to test a push withou a fetch first
Merge branch 'master' of github.com:teampingu/tonys-project