Tablet changes
Merge branch 'master' of github.com:hyoung8962/sample3

Conflicts:
	text1.txt