tester
Merge branch 'master' of https://github.com/MediaAPPDev/Horoscope

Conflicts:
	Horoscope.xcodeproj/project.pbxproj

Horoscope.xcodeproj/project.xcworkspace/xcuserdata/SAT.xcuserdatad/UserI
nterfaceState.xcuserstate
	Horoscope/AppDelegate.m
	Horoscope/Found/FoundViewController.m
	Horoscope/TodayYs/TodayLuckViewController.m