MERGE
Merge branch 'master' of github.com:jposton2/cs326
Merge branch 'master' of github.com:jposton2/cs326
Some edits of minor consequence.
Merge branch 'master' of github.com:jposton2/cs326