Add ec2 local .bashrc and .gitconfig
Merge branch 'master' of github.com:cpatulea/dotfiles

Conflicts:
	.bashrc
	.gitconfig