Added .gitignore
Merge branch 'staging' into userproducts