adds pages to cardstack, fixes merge conflicts
Merge pull request #4 from tgilan/feature/carstack_pages

adds pages to cardstack, fixes merge conflicts