Changed from tablet
Revert "Conflict changes from PC"

This reverts commit 224b92e63c094cc38dc4f94f9a4f4c1eadafebcb.

Conflicts:
	text3.txt
Commit merge of data