new file:   chrome/SwitchyOptions.bak
	new file:   ranger/rc.conf

	new file:   chrome/SwitchyOptions.bak
	new file:   chrome/Vimium.rc
	new file:   chrome/tmScripts.cfg.txt
	new file:   chrome/xnotifier_ch.cfg.xn
	new file:   firefox/GM-JS/Crack_Url_Wait_Code_Login.user.js
	new file:   firefox/GM-JS/Super_preloaderPlus_one.user.js
	new file:   firefox/GM-JS/flashviewer.user.js
	new file:   firefox/GM-JS/picviewer.user.js
	new file:   "firefox/GM-JS/\351\243\216\351\231\251\350\204\232\346\234\254\350\277\207\346\273\244\345\231\250.user.js"
	new file:   firefox/Tab_Mix_Plus.cfg.txt
	new file:   firefox/UC/chrome/drag.uc.js
	new file:   firefox/UC/chrome/unused/UserAgentChangeModLite.uc.js
	new file:   firefox/UC/chrome/updatebookmarklite.uc.js
	new file:   firefox/UC/chrome/userChrome.css
	new file:   "firefox/UC/chrome/\346\200\273\345\234\250\345\233\276\347\211\207\344\270\212\346\230\276\347\244\272\351\207\215\346\226\260\350\275\275\345\205\245\345\233\276\345\203\217.uc.js"
	new file:   "firefox/UC/chrome/\351\231\204\344\273\266\347\273\204\344\273\266\351\241\265\351\235\242\345\242\236\345\274\272.uc.js"
	new file:   "firefox/UC/chrome/\351\231\204\345\212\240\347\273\204\344\273\266\347\256\241\347\220\206\345\231\250\346\230\276\347\244\272\345\234\260\345\235\200\346\240\217.uc.js"
	new file:   "firefox/UC/chrome/\351\241\265\351\235\242\345\217\263\351\224\256\350\217\234\345\215\225\344\270\255\345\242\236\345\212\240\345\244\215\345\210\266\351\223\276\346\216\245\346\226\207\346\234\254.uc.js"
	new file:   "firefox/UC/chrome/\351\241\265\351\235\242\345\217\263\351\224\256\350\217\234\345\215\225\345\242\236\345\212\240\347\274\226\347\240\201.uc.js"
	new file:   firefox/adblock.cfg
	new file:   firefox/autoproxy.cfg
	new file:   firefox/firegestures-2014-01-14.cfg.sqlite
	new file:   firefox/mason-backup.txt
	new file:   firefox/noscript.cfg
	new file:   firefox/session_manager.cfg
	new file:   firefox/xnotifier_ff.cfg.xn
	new file:   ranger/__pycache__/commands.cpython-33.pyo
	new file:   ranger/bookmarks
	new file:   ranger/commands.py
	new file:   ranger/history
	new file:   ranger/plugins/__init__.py
	new file:   ranger/rc.conf
	new file:   ranger/rifle.conf
	new file:   ranger/scope.sh
	new file:   ranger/tagged
	new file:   vim|vimperator-rc/.vimperatorrc
	new file:   vim|vimperator-rc/.vimrc_home
	new file:   vim|vimperator-rc/vimrc_etc
	new file:   zsh/.aliases
	new file:   zsh/.zprofile
	new file:   zsh/.zshrc

	new file:   chrome/SwitchyOptions.bak
	new file:   chrome/Vimium.rc
	new file:   chrome/tmScripts.cfg.txt
	new file:   chrome/xnotifier_ch.cfg.xn
	new file:   firefox/GM-JS/Crack_Url_Wait_Code_Login.user.js
	new file:   firefox/GM-JS/Super_preloaderPlus_one.user.js
	new file:   firefox/GM-JS/flashviewer.user.js
	new file:   firefox/GM-JS/picviewer.user.js
	new file:   "firefox/GM-JS/\351\243\216\351\231\251\350\204\232\346\234\254\350\277\207\346\273\244\345\231\250.user.js"
	new file:   firefox/Tab_Mix_Plus.cfg.txt
	new file:   firefox/UC/chrome/drag.uc.js
	new file:   firefox/UC/chrome/unused/UserAgentChangeModLite.uc.js
	new file:   firefox/UC/chrome/updatebookmarklite.uc.js
	new file:   firefox/UC/chrome/userChrome.css
	new file:   "firefox/UC/chrome/\346\200\273\345\234\250\345\233\276\347\211\207\344\270\212\346\230\276\347\244\272\351\207\215\346\226\260\350\275\275\345\205\245\345\233\276\345\203\217.uc.js"
	new file:   "firefox/UC/chrome/\351\231\204\344\273\266\347\273\204\344\273\266\351\241\265\351\235\242\345\242\236\345\274\272.uc.js"
	new file:   "firefox/UC/chrome/\351\231\204\345\212\240\347\273\204\344\273\266\347\256\241\347\220\206\345\231\250\346\230\276\347\244\272\345\234\260\345\235\200\346\240\217.uc.js"
	new file:   "firefox/UC/chrome/\351\241\265\351\235\242\345\217\263\351\224\256\350\217\234\345\215\225\344\270\255\345\242\236\345\212\240\345\244\215\345\210\266\351\223\276\346\216\245\346\226\207\346\234\254.uc.js"
	new file:   "firefox/UC/chrome/\351\241\265\351\235\242\345\217\263\351\224\256\350\217\234\345\215\225\345\242\236\345\212\240\347\274\226\347\240\201.uc.js"
	new file:   firefox/adblock.cfg
	new file:   firefox/autoproxy.cfg
	new file:   firefox/firegestures-2014-01-14.cfg.sqlite
	new file:   firefox/mason-backup.txt
	new file:   firefox/noscript.cfg
	new file:   firefox/session_manager.cfg
	new file:   firefox/xnotifier_ff.cfg.xn
	new file:   ranger/__pycache__/commands.cpython-33.pyo
	new file:   ranger/bookmarks
	new file:   ranger/commands.py
	new file:   ranger/history
	new file:   ranger/plugins/__init__.py
	new file:   ranger/rc.conf
	new file:   ranger/rifle.conf
	new file:   ranger/scope.sh
	new file:   ranger/tagged
	new file:   vim|vimperator-rc/.vimperatorrc
	new file:   vim|vimperator-rc/.vimrc_home
	new file:   vim|vimperator-rc/vimrc_etc
	new file:   zsh/.aliases
	new file:   zsh/.zprofile
	new file:   zsh/.zshrc
	deleted:    chrome/xnotifier_ch.cfg.xn
	deleted:    firefox/xnotifier_ff.cfg.xn
	modified:   ranger/bookmarks
	modified:   ranger/history
Merge branch 'master' of https://github.com/knight-96/My_Files

Conflicts:
	ranger/bookmarks
	ranger/history

	new file:   chrome/xnotifier_ch.cfg.xn
	new file:   firefox/xnotifier_ff.cfg.xn
	modified:   ranger/bookmarks
	modified:   ranger/history
	deleted:    chrome/xnotifier_ch.cfg.xn
	deleted:    firefox/xnotifier_ff.cfg.xn