Do some swapping to confuse you, hehehe
Resolve the merge conflict.. yeay
Merge pull request #4 from chaosAD/master

Do some swapping to confuse you, hehehe