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