Ryan: Finished converting from military time to 12-hour.
Merge branch 'master' of github.com:JakeWaffle/LCSC-Campus-Life