Update .gitignore
Merge branch 'master' of git@github.com:SportBox/SportBoxDev.git
Merge branch 'master' of git@github.com:SportBox/SportBoxDev.git
Merge branch 'master' of git@github.com:SportBox/SportBoxDev.git