merge
fix js
fix gitignore
add public file
fix link