Created a new file file2.txt and changed a line in file2.txt
Merge branch '20140829_v22'

Conflicts:
	file1.txt

Resolved conflicts using magit-ediff and added file2.txt