daily commit
Merge branch 'master' of github.com:DaleCooper/lightfields

Conflicts:
	rapport/biblio.bib