stuff from work
Merge branch 'master' of github.com:lucaswilric/dotfiles

Conflicts:
	vimrc
Merge branch 'master' of github.com:lucaswilric/dotfiles
Add Ctrl-P
Coloured prompt