coomit for pull dragon merge
merge conflict  code
Merge branch 'master' of github.com:opendream/journal_live