Config changes from chromebook
Merge branch 'master' of https://github.com/jglukasik/dotfiles

Conflicts:
	bashrc