2014-1-28 commit
Merge branch 'master' of github.com:choclover/Tips-Doc