#13
Merge branch 'master' into tempNew

Conflicts:
	text.txt