Update Haha.txt

New remote branch 1
push to remote master
merge two branches
test rebasing
rebasing test
Make it:1
set it to 2
the Haha.txt file?
Add the new distributed file