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

Conflicts:
	Horoscope/Images.xcassets/LaunchImage.launchimage/Contents.json