Update
Merge branch 'master' of https://github.com/hnth2507/videoslide

Conflicts:
	VideoSlide.xcodeproj/project.xcworkspace/xcshareddata/VideoSlide.xccheckout