added welcome.min.js file in gitignore
Merge branch 'ray'