Merge branch 'staging'
Merge branch 'staging'
Merge branch 'staging'
added gitignore file
Merge branch 'master' into staging