merged

merged
Merge branch 'master' of https://github.com/maido155/frio-web

Conflicts:
	index.html