Merge pull request #27 from kneekey23/nicole

Nicole
page 1 is all hooked up
Merge branch 'master' into twobirds-jw1
Merge pull request #28 from kneekey23/twobirds-jw1

page 1 serializes, hooray
css changes
Merge branch 'master' into nicole
message