marjun

test commit
part 2
Merge pull request #4 from ChinOY08/master

marjhun sample merge