Merge branch 'master' of https://github.com/Ian-Stewart-Binks/cscourseplanner into hotfix-sat-section

Conflicts:
	style/timetable_styles.css
Merge branch 'hotfix-sat-section' of https://github.com/Ian-Stewart-Binks/cscourseplanner into hotfix-sat-section