Merge branch 'summer' of https://github.com/Ian-Stewart-Binks/cscourseplanner into minor-issue-cleanups
Cookies finished and some layout is done, not all. Conflict now raises 'warning'- still needs to be styled
Update timetable_creator.html

I switched the timetable conflict warning. A growing voice inside of me says that I should only ever commit something that I think could somehow slip into production. Left it initially as a 'this will remind me to come back and redo it', but I am seeing now that that attitude is a lame attitude.

The conflict warning is something I want to discuss though, and right now it is awfully obnoxious.
Style clean up for email.php

Back to regular alignment of equals symbols.
Fixed layout for small screens

Also removed overflow:hidden
Merge pull request #105 from Ian-Stewart-Binks/small-screen

Fixed layout for small screens
Merge branch 'cookies' of https://github.com/Ian-Stewart-Binks/cscourseplanner into summer

Conflicts:
	timetable_creator/js/processCourse.js
	timetable_creator/ui/timetable_creator.html
	timetable_creator/ui/timetable_styles.css
Merge branch 'summer' of https://github.com/Ian-Stewart-Binks/cscourseplanner into web-parsing

Conflicts:
	timetable_creator/js/processCourse.js