.gitignore file
package.json
Merge branch 'javascript' of github.com:stouf/test into javascript