Leetle bit
Merge branch 'restart' of https://github.com/esnowkropla/eskthesis into restart

Conflicts:
	tex/aqc.tex