From feature2
Adding newfile2
Adding JS folder
Fixed merge conflict while rebasing feature2 branch
Merge branch 'master' of https://github.com/ramanathanm/git-workouts