win pref
Merge branch 'master' of https://github.com/hanbf/bfnix-scripts

Conflicts:
	sublime2/Packages/User/Preferences.sublime-settings