Potae mai ma
Merge branch 'master' of https://github.com/verachai-panchaicharone/potae

Conflicts:
	test.txt