new file:   .bashrc
Initial commit
Merge https://github.com/FStephenQ/Conf
	modified:   .bashrc
	modified:   .vim/.netrwhist
	modified:   .xmobarc
modified:   .xmonad/xmonad.hs
	modified:   .vim/.netrwhist
Initial commit
Added main script
Renamed to thunner. Usage has been added to the README.
Fixed README format
Fixed configuration file path
Added new ']' play mode. Fixed unicode bug.
Removed example .thunnerlogo
Added link to Simon Weber's API
Fixed README.
Moved thunner.py to thunner
Added 'Usage' to README
Exit when ~/.thunnerrc not found
Merge https://github.com/mstill/thunner

Conflicts:
	README.md

l#
Merge branch 'master' of https://github.com/FStephenQ/Personal-Dotfiles

Conflicts:
	.vim/.netrwhist
	.vim/doc/tags
	.vimrc
	.xmobarc
	.xsession
	modified:   .vimrc