chapter 3
Merge branch 'master' of https://github.com/minmit/BS-Thesis

Conflicts:
	.thesis.ptd
	resources/chapters/.3.ptd
	resources/chapters/3.tex
	thesis.synctex