Merging new stuff
Merge branch 'master' of https://github.com/kawfee/TaylorCampusInfo
Merge branch 'master' of https://github.com/kawfee/TaylorCampusInfo