Merge pull request #1 from GoldMax/master

hello
test
Merge pull request #2 from RomulT/master

test2