more
Merge branch 'master' of https://github.com/MTRX3700Dirac/Yavin4DefenceSystem

Conflicts:
	Report/TECHNICAL MANUAL.pdf
	Report/TECHNICAL MANUAL.synctex.gz
Merge branches 'master' and 'master' of https://github.com/MTRX3700Dirac/Yavin4DefenceSystem

Conflicts:
	Report/TECHNICAL MANUAL.aux
	Report/TECHNICAL MANUAL.pdf
	Report/TECHNICAL MANUAL.synctex.gz
	Report/TECHNICAL MANUAL.tex
More things
Merge branch 'master' of https://github.com/MTRX3700Dirac/Yavin4DefenceSystem

Conflicts:
	Report/TECHNICAL MANUAL.aux
	Report/TECHNICAL MANUAL.pdf
	Report/TECHNICAL MANUAL.synctex.gz
	Report/TECHNICAL MANUAL.tex