resolved conflict

copied code from cole's branch for text editor stuff