index and show pages
Merge pull request #53 from maiahariton/master

index and show pages