This works good on laptop.
Merge remote-tracking branch 'origin/master' into new
Vostro config for Xresources.
Vostro
temp removal
Removed skype autostart and changed layout.
Added shortcut for NERDTree.
Added aliases for git.
Update to all.
Merge remote-tracking branch 'origin/master' into merge_branche
Fixed conflicts between the destop and laptop.

Conflicts:
	conf/Xresources
	conf/zshrc