Merge branch 'master' of https://github.com/Yuhuu/newversion

Conflicts:
	README.md
	index.html
	slider.js
fra even 19:00

26 Nov
ingen

ingen