Merge branch 'master' of https://github.com/ElvinJin/Video-Background …
Conflicts: VideoBackground.obj/VideoBackground.obj.xcodeproj/project.xcworkspace/xc userdata/pjin.xcuserdatad/UserInterfaceState.xcuserstate VideoBackground.swift/VideoBackground.swift.xcodeproj/project.xcworkspac e/xcuserdata/pjin.xcuserdatad/UserInterfaceState.xcuserstate