new comments for bishop class
taking out the path to the python interpreter
conflict resolution
breaking interpreter again
samesamesame
Merge branch 'testing' into brynn