initial commit
Merge branch 'master' of github.com:jinpan/IAP_2014