master again: should not forget the wonders of branching
broken but moving forward
fixed win_str
marks selectable and settable from dmenu
added .gitignore
gitignore corrected
Merge remote-tracking branch 'upstream/master'

Conflicts:
	examples/winmenu.py
removed unnecessary json import
Updated documentation.
Merge branch 'joepvd/merge'
Ignores __pycache__