more debugging
Merge branch 'master' of https://github.com/lyeary/cosc460