fixed js again
Merge branch 'master' of github.com:opendream/journal_live
add css
merge