edited bc titus told me to
Merge pull request #1 from lmjohnstone/master

pull req
Merge pull request #1 from fulleffect/master

pulling