version 1
Merge branch 'master' of github.com:tonytamsf/ios-howtotip