2014-2-13 commit
Merge branch 'master' of https://github.com/choclover/Tips-Doc