Report
Merge branch 'master' of https://github.com/RainbowLyte/Vox

Conflicts:
	Report/report.pdf