slider
Merge branch 'master' of https://github.com/zolotoy/mf

Conflicts:
	Index.html