add view
Merge branch 'master' of https://github.com/yangjunsss/HappyClock

Conflicts:

HappyClock/HappyClock.xcodeproj/project.xcworkspace/xcshareddata/HappyCl
ock.xccheckout