They say I should commit.
Merge branch 'master' of https://github.com/sbhs-forkbombers/sbhs-timetable-node

Conflicts:
	timetable.js