added javascript file
merge