tfos chapter 2 and 3
Merge branch 'master' of https://github.com/davidmyers9000/davidmyers9000.github.com.old