clear
<3
add new
master 3
new 4
Merge branch 'new'

Conflicts:
	master.txt