merge basic.html
merge parsley.js