git merge woot
Merge branch 'master' of https://github.com/phouse512/teaching_git