add - updates!
clean - path loading
add - cleanup
rm - conflict
Merge branch 'master' of github.com:stites/cfg

Conflicts:
	.bashrc