lol
Merge branch 'master' of https://github.com/LiamOS/4thlabs

Conflicts:
	electronics/report.pdf
	electronics/report.tex
	latex/lab.sty
lol