Teacher

merging the teacher branch with the master branch (though, the original chortle code is mostly commented out for the time being...) for now, the teacher code is a higher priority