push before pull -- still working on 6
Merge branch 'master' of https://github.com/jault3/CS386Lab4