add some files
add .gitignore
test for javascript
merge