gu
Merge remote branch 'upstream/master'
update code marker theme
resolve conflict
use rythm-web mode for code mirror
codemirror rythm mode
Merge pull request #28 from greenlaw110/master

update code mirror style, added codemirror-rythm mode