Fixed merge issues
Merge pull request #9 from jwinskill/RatingStars

Fixed merge issues