began new papers index
conflict fixed in papers index
Merge branch 'master' of github.com:edbaskerville/openpub
css reorganization
resolved conflict