Getting rid of registry stuff
Merge branch 'master' of github.com:rboling/CS262