added .idea, .bash_aliases, and .gitconfig -- updated git prompt
Merge branch 'master' of github.com:nick-brown/systemFiles

Conflicts:
	.bashrc
updated colors and aliases