add to 6
Merge branch 'master' of github.com:jault3/CS386Lab4