update preamble
update
Merge branch 'master' of https://github.com/francktcheng/BSERROR
update
Conflicts:
	doc/report/report.aux
	doc/report/report.log
	doc/report/report.pdf