Design Database update
Merge branch 'master' of https://github.com/JoelLongRoad/COMP4Coursework

Conflicts:
	Design/design.tex
	coursework.pdf