fixed
s
Merge branch 'master' of https://github.com/sharikul/F.js

Conflicts:
	h.html