You're too annoying.

I'll just commit this for now.
MOAR CRAP
blah
thing
Merge branch 'master' of https://github.com/gnustomp/SBHS-Timetable into FUUUUUUIHAVETOMERGEMANUALLY

Conflicts:
	timetable.html
	tt-helper.html

Used his version.
Revert change.
Merge branch 'master' of https://github.com/keepcalm444/SBHS-Timetable

Conflicts:
	timetable.html

MAYBE I CAN PUSH NOW?