won't let me change to Tyler's branch

so I'm updating.  It's some random txt file, so it shouldn't affect the
code