remove text from central rollback, add new text.
Update master after rollback
Merge branch 'master' of https://github.com/juliakeffer/julia_demo

Conflicts:
	test3.txt