Added scripts for auto-merging, pushing, and pulling changes
Merge branch 'master' into hoyt