show page and comments
Merge branch 'jeremy'
Merge branch 'master' into joe

Merging
added voting