Merge remote-tracking branch 'origin/delta'

update.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 
 git reset --hard
+git checkout master
 git pull origin master --ff-only
 git checkout master@{'24 hours ago'}