test commit nick..
12:10 Shumnan test
solve conflict..
XSLT Code Generator
Merge remote-tracking branch 'origin/petch'
Merge remote-tracking branch 'origin/nick'

Conflicts:
	Hello.txt
Add UniqueID for export file
test conflict

just add hello on the top of the file V2
Merge remote-tracking branch 'origin/Chatchai'
Test Conflict!!!!