Merge pull request #2 from littlesongtzu/master

bash pull-request
Update main.php
Update main.php
local commit
conflict solved
Merge pull request #1 from songtzu/master

pull request