slidertest
Merge branch 'master' of https://github.com/Jari-Ra/ActiveWeather

Conflicts:
	index.html