Adding oneliner to README for rebase example
Saying thanks to all my students
Adding another change after rebase
mb before rebase conflicts
mb conflicting changes brewing
fb adding some trouble to simple.html
Adding changes after rebasing conflict