lets try to fix the encoding this way
Merge branch 'remote-raspberry'

Conflicts:
	public/index.html
	public/js/bundle.js