add new text
Merge remote-tracking branch 'remotegit/master'

Conflicts:
	baru.php