Original version
Added a gitignore file for the project
now the Backup Dir is inside the project
Merge branch 'master' of github.com:marco-loche/dotfiles

Conflicts:
	.gitignore
	Makefile
	bash/.env.swp
	bash/bash_aliases
	bash/config
	bash/env
	bashrc
	config.d/gitconfig
	config.d/gitignore
	config.d/jshintrc
	install.sh