Local change
Merge branch 'master' of github.com:bitrip/kamawan
Added feature1
Added feature2
Added additional features2
Merge
Added feature3
Fixed bug #1234
Really fixing bug #1234
Before New Branch
Changed README.txt
Updated README
Updated bebe.txt
Added Fix1
Added Fix2
Added Fix1

Conflicts:
	file1.txt
Fixes merged to master
heh