All Functionality Changes
Merge branch 'Working' of https://github.com/team03/TimeTablingSystem into Working

Conflicts:
	CreateRequest.aspx
	SettingsPage.aspx
	Site.master
	Styles/Settings.css
	Styles/Site.css
	ViewResults.aspx
	ViewResults.js