updaaate
Merge branch 'master' of git://github.com/dpaneda/code

Conflicts:
	home/.bashrc
	home/.gitconfig