Merge pull request #23 from maiahariton/master

splash page and about us page
working with fitbit JSON
Merge pull request #24 from ncaskey04/dev

working with fitbit JSON