test body utf8
Merge branch 'develop' of github.com:mpmont/presentation into develop

Conflicts:
	assets/scripts/body.css