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

Conflicts:
	js/tabs.js
	utilities/web_parsing/old/timeTableRetriever.py
	utilities/web_parsing/old/timeTableScraper
	web_parsing/old/timeTableRetriever.py
	web_parsing/old/timeTableScraper
	web_parsing/timeTableRetriever.py
	web_parsing/timeTableScraper
	web_parsing/timetableParser.py
Merge branch 'cleaning' of https://github.com/Ian-Stewart-Binks/cscourseplanner into cleaning