Cleaned up some stuff
Merge branch 'master' of github.com:pfkhens/475