Documented three classes.
Deleted an offending file (that I had; Tribex didn't).
Nothing really. I just have to commit to see if that will fix the
problem with merging.
Merge branch 'Nateowami-master'