Merge branch 'master' of git.classic.cx:utk/cs494