adding from my craptop
Merge branch 'master' of https://github.com/pmunson/try_git