Change pixelsize for laptop
Merge remote-tracking branch 'origin/master' into laptop
Add cool chars to ohcibi theme on laptop
Merge branch 'master' into laptop
Merge branch 'master' into laptop

Conflicts:
	ohcibi.zsh-theme
Awesome config upgrade to 3.5