before merge home and work version
before merge
Merge branch 'master' of https://github.com/thmsaurel/.atom

Conflicts:
	config.cson
	packages/atom-color-highlight/node_modules/oniguruma/build/Makefile
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/onig_scanner.node
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/onig_scanner/src/onig-cache.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/onig_scanner/src/onig-reg-exp.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/onig_scanner/src/onig-result.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/onig_scanner/src/onig-scanner-worker.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/onig_scanner/src/onig-scanner.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/onig_scanner/src/onig-searcher.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/onig_scanner/src/unicode-utils-posix.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma.a
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/enc/ascii.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/enc/big5.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/enc/cp1251.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/enc/euc_jp.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/enc/euc_kr.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/enc/euc_tw.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/enc/gb18030.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/enc/iso8859_1.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/enc/iso8859_10.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/enc/iso8859_11.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/enc/iso8859_13.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/enc/iso8859_14.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/enc/iso8859_15.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/enc/iso8859_16.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/enc/iso8859_2.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/enc/iso8859_3.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/enc/iso8859_4.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/enc/iso8859_5.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/enc/iso8859_6.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/enc/iso8859_7.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/enc/iso8859_8.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/enc/iso8859_9.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/enc/koi8.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/enc/koi8_r.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/enc/mktable.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/enc/sjis.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/enc/unicode.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/enc/utf16_be.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/enc/utf16_le.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/enc/utf32_be.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/enc/utf32_le.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/enc/utf8.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/regcomp.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/regenc.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/regerror.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/regexec.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/regext.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/reggnu.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/regparse.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/regposerr.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/regposix.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/regsyntax.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/regtrav.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/regversion.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/obj.target/oniguruma/deps/onig/st.o
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/onig_scanner.node
	packages/atom-color-highlight/node_modules/oniguruma/build/Release/oniguruma.a
	packages/atom-color-highlight/node_modules/pigments/package.json
	packages/atom-color-highlight/package.json
	packages/file-icons/package.json
	packages/git-plus/node_modules/fs-plus/package.json
	packages/git-plus/package.json
	packages/linter-coffeelint/node_modules/coffeelint/package.json
	packages/linter-coffeelint/package.json
	packages/linter-lua/package.json
	packages/linter/CHANGELOG.md
	packages/linter/README.md
	packages/linter/node_modules/font-awesome/node_modules/less/node_modules/request/node_modules/qs/Readme.md
	packages/linter/package.json
	packages/minimap-color-highlight/node_modules/emissary/node_modules/underscore-plus/package.json
	packages/minimap-color-highlight/package.json
	packages/minimap/node_modules/delegato/package.json
	packages/minimap/node_modules/prolix/package.json
	packages/minimap/node_modules/semver/package.json
	packages/minimap/package.json
	packages/sort-lines/package.json