weird behavior
Merge branch 'master' of github.com:n-critser/267-proj