GRRR, branches :)
improve code efficientcy
Merge branch 'develop'

Conflicts:
	js/timetable.js
Merge branch 'master' of github.com:HaGoijer/Site