asdasd
Merge branch 'tempNew'

Conflicts:
	text.txt