Add horoscope model
Resolve merge conflicts