More fixes
Merged
Merge conflicts
Merge branch 'master' of https://github.com/sagieske/AA1

Conflicts:
	two/report/bibliography.tex