Merge branch 'master' of https://github.com/cbraz/tagleberry

Conflicts:
	__pycache__/FileMD.cpython-33.pyc
	__pycache__/filedict.cpython-33.pyc