KINGoxlong/FirstProject — pull request #3 by KINGoxlong (2013-12-15 13:44:15+00:00)
Title: merge from master to branch

code merge from master to branch