Removed .bash_aliases
Merge branch 'master' of github.com:asdf404/config

Conflicts:
	bashrc/install.sh