Change Xresources
Merge branch 'master' of github.com:Icarurs/dotfiles

Conflicts:
	.Xresources
Edit Xresources to use nice Powerline fonts