Fixed some bugs in some things, and other stuff.
Merge branch 'master' of https://github.com/purdueLUG/BoilerBuntu