test commit nick..
12:10 Shumnan test
solve conflict..
Test Petch
Merge remote-tracking branch 'origin/petch'
Merge remote-tracking branch 'origin/nick'

Conflicts:
	Hello.txt