updated merge_and_push.sh
Merge branch 'master' into kingman