Update
Merge branch 'master' of https://github.com/KillianMcCabe/DISCE-Webapp

Conflicts:
	Non-Core Files/docs/Project_Plan.doc