random fixes
Merge branch 'master' of github.com:shaddi/bdm-final

Conflicts:
	report/main.bib