Added json merge of files and extra time fields for the javascript. Still using timetable file counterparts to store json for now, will change soon
Merge branch 'summer' of https://github.com/Ian-Stewart-Binks/cscourseplanner into summer

Conflicts:
	web_parsing/timetableParser.py