Fix brice name.
Fix conflict.

Conflicts:
	app/_includes/about.html