modified:   .bashrc
	modified:   .vimrc
Merge branch 'master' of github.com:asoplata/acid_burn