111111
2014.8.7
Merge branch 'dev' of github.com:collinsmao/blog into dev1