Fixin' bugs.
Merge branch 'master' of https://github.com/JakeWaffle/LCSC-Campus-Life