Moved irrelevant stuff to Entropy, for turn-in purposes
Merge branch 'master' of github.com:deaddog/sw505-code