updated all
Merge branch 'master' of https://github.com/joroni/reisandirvys-012314

Conflicts:
	www/index.html
index