pre pull
pullMerge branch 'master' of https://github.com/CaptainKanuk/eartraining
pre push