qw
Merge branch 'master' of https://github.com/jakkrit2009/123

Conflicts:
	21/New Text Document.txt
sd