sec3
Merge branch 'master' of github.com:jedestep/idrk

Conflicts:
	writeup/report.tex