dumb
Merge branch 'master' of https://github.com/vominhnhut99/TinyZodiacs

Conflicts:

proj.ios/TinyZodiacs.xcodeproj/project.xcworkspace/xcuserdata/minhnhutvo
.xcuserdatad/UserInterfaceState.xcuserstate