cite color
Merge branch 'master' of https://github.com/Marman1337/Final-Year-Project

Conflicts:
	Report TeX/Thesis.pdf