Haha, just kidding. You know all those commits that I said happened in the last commit message, yea, they're actually in this one
Merge branch 'master' into tryingToFix