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

Conflicts:
	Horoscope/PrefixHeader.pch