Changing the fonts
Merge branch 'master' of https://github.com/steveshogren/Dot-Emacs

Conflicts:
	my-colors.el
Adding tabbar mode
Merge branch 'master' of https://github.com/steveshogren/Dot-Emacs
Merge branch 'master' of https://github.com/steveshogren/Dot-Emacs
Adding a shortcut for enter to do the persistent action in helm
Adding helm ls for finding files and binding it to C-S-t
Merge branch 'master' of https://github.com/steveshogren/Dot-Emacs

Conflicts:
	helm-settings.el