first merge
Merge pull request #2 from omgmakeme/pangda

first merge