Merge pull request #58 from amychiu/amy/development2

need to put in spinner when loading for the first time