indents. mergetool fugitive (not working..)
add dlisa
Merge branch 'master' of https://github.com/aisapatino/configs

Conflicts:
	git/check_statuses.sh