Theo's add
Merge branch 'master' of https://github.com/Marman1337/KinectProject

Conflicts:
	Report/KinectReport.tex