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