tarako and flame filters for logcat-color
Merge branch 'master' of https://github.com/marshall/dotfiles

Conflicts:
	logcat-color/logcat-color.symlink
default gitconfig