change call function
ignored .bak file
change theme
Merge branch 'master' of https://github.com/flug/dotfiles

Conflicts:
	gitignore_global