started over
Merge branch 'master' of github.com:pyryk/thesis

Conflicts:
	dippa.tex