Updated
d
Merge branch 'gh-pages' of https://github.com/sharikul/F.js into gh-pages

Conflicts:
	params.json
Merge branch 'gh-pages' of https://github.com/sharikul/F.js into gh-pages