merge conflict
Merge branch 'master' of https://github.com/morengab/creme-brulee

Conflicts:
	eric-test.php