Added hardware
Merge branch 'master' of github.com:petergp/02232

Conflicts:
	Slides/template.tex
Merge
Merge branch 'master' of github.com:petergp/02232

Conflicts:
	Slides/template.pdf
	Slides/template.tex