css edit
Merge branch 'master' of github.com:opendream/journal_live
Merge branch 'master' of github.com:opendream/journal_live
Merge branch 'master' of github.com:opendream/journal_live
Merge branch 'master' of github.com:opendream/journal_live
add people template
Merge branch 'master' of github.com:opendream/journal_live