Merge pull request #13 from AmyWhitney/master

Account pages
Merge pull request #14 from AmyWhitney/account-page

Merge pull request #13 from AmyWhitney/master