Ignore non js files
Merge branch 'working'