general information
Merge branch 'master' of https://github.com/michaelb87/bi2

Conflicts:
	report/report.tex