#test1
#test2
Merge branch 'branch2'

Conflicts:
	other.js