Addition of .gitignore, updated paths on js assets.
Addition of .gitignore, updated paths on js assets.
Merge remote-tracking branch 'origin/master'