demo.sh changed
add hehe to rebase.rb
add hehe to merge.rb in master at 15.17