Add .gitignore
Merge branch 'splitWork' into dev
Merge branch 'dev'