// Danny's having trouble uploading to github, so here's all of his additions
Merge branch 'termio'