yhuio
Merge branch 'master' of https://github.com/sumannaskar/proj2

Conflicts:
	wedingproj/wedingproj.xcodeproj/project.pbxproj
ghg