More things
Merge branch 'master' of github.com:jposton2/cs326