moving this so they make sense.
Merge branch 'master' of https://github.com/NathanielWaggoner/studying_with_sean