Fixing if statements
Merge branch 'master' of github.com:unceus/dotfiles

Conflicts:
	.bashrc
Fix grc