update
Merge https://github.com/chris-erasmus-agilemobiledev/gitTraining