Add GFM newline option in config file
change code wrap to overflow-x: auto;
delete conflict files in subl
delete conflict dropbox fix files
Merge branch 'master' of https://github.com/nolboo/nolboo.github.io