replace
Merge branch 'master' of https://github.com/xiaoyanArya/new5

Conflicts:

new5.xcodeproj/project.xcworkspace/xcuserdata/rashmi.xcuserdatad/UserInt
erfaceState.xcuserstate
merge