Query2
Merge branch 'master' of github.com:sangisos/pkdhomeass2

Conflicts:
	pkdhomeass2analysis.tex
Merge branch 'master' of github.com:sangisos/pkdhomeass2