Upadated readme
added bla
hi there
emacs
Merge branch 'b2' into b1
Merge branch 'b1'

Conflicts:
	nano