Merge branch 'develop'
Merge branch 'develop'
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into develop
Adding directory local to gitignore file so we can store local scripts without having to dodge around git add