View settings adapted
Merge branch 'master' of https://github.com/dacappo/sambet

Conflicts:
	app/www/index.html
Intro added and integrated