cleaned up some MVP in GuessCharadeFiles
fixed minor conflict after antons push