Fixing merge conflicts
Merge master
Merge pull request #15 from jasonwhlaw/baby_page_styling

New baby page styling