slidertest
Merge pull request #2 from neskola/master

Remember to pull this
Merge branch 'master' of https://github.com/Jari-Ra/ActiveWeather

Conflicts:
	index.html
fixed merge conflict
bootstrap slidertest

added bootstrap-slider, slidertest.js, customstylesheet.css
Merge pull request #2 from Jari-Ra/master

Merge pull request #2 from neskola/master