second commit
OMG
change encode
Merge branch 'master' of github.com:kewpie/test

Conflicts:
	sample.txt