Initial commit, more or less?
	new file:   .gitignore
	new file:   README.md
	new file:   config_setup.sh
	new file:   generic/.bashrc
	new file:   generic/.emacs
	new file:   generic/.inputrc
	new file:   generic/.pentadactylrc
	new file:   generic/.pythonrc
	new file:   generic/.vim/colors/mustang.vim
	new file:   generic/.vimrc
	new file:   generic/fonts/PragmataPro/PragmataPro-B.ttf
	new file:   generic/fonts/PragmataPro/PragmataPro-I.ttf
	new file:   generic/fonts/PragmataPro/PragmataPro-Z.ttf
	new file:   generic/fonts/PragmataPro/PragmataPro.ttf
	new file:   generic/fonts/SourceCodePro for Powerline/LICENSE.txt
	new file:   generic/fonts/SourceCodePro for Powerline/README.rst
	new file:   generic/fonts/SourceCodePro for Powerline/Sauce Code Powerline Black.otf
	new file:   generic/fonts/SourceCodePro for Powerline/Sauce Code Powerline Bold.otf
	new file:   generic/fonts/SourceCodePro for Powerline/Sauce Code Powerline ExtraLight.otf
	new file:   generic/fonts/SourceCodePro for Powerline/Sauce Code Powerline Light.otf
	new file:   generic/fonts/SourceCodePro for Powerline/Sauce Code Powerline Medium.otf
	new file:   generic/fonts/SourceCodePro for Powerline/Sauce Code Powerline Regular.otf
	new file:   generic/fonts/SourceCodePro for Powerline/Sauce Code Powerline Semibold.otf
	new file:   generic/fonts/SourceCodePro for Powerline/fonts.dir
	new file:   generic/fonts/SourceCodePro for Powerline/fonts.scale
	new file:   generic/fonts/SourceCodePro_FontsOnly-1.009/LICENSE.txt
	new file:   generic/fonts/SourceCodePro_FontsOnly-1.009/ReadMe.html
	new file:   generic/fonts/SourceCodePro_FontsOnly-1.009/SourceCodePro-Black.otf
	new file:   generic/fonts/SourceCodePro_FontsOnly-1.009/SourceCodePro-Black.ttf
	new file:   generic/fonts/SourceCodePro_FontsOnly-1.009/SourceCodePro-Bold.otf
	new file:   generic/fonts/SourceCodePro_FontsOnly-1.009/SourceCodePro-Bold.ttf
	new file:   generic/fonts/SourceCodePro_FontsOnly-1.009/SourceCodePro-ExtraLight.otf
	new file:   generic/fonts/SourceCodePro_FontsOnly-1.009/SourceCodePro-ExtraLight.ttf
	new file:   generic/fonts/SourceCodePro_FontsOnly-1.009/SourceCodePro-Light.otf
	new file:   generic/fonts/SourceCodePro_FontsOnly-1.009/SourceCodePro-Light.ttf
	new file:   generic/fonts/SourceCodePro_FontsOnly-1.009/SourceCodePro-Regular.otf
	new file:   generic/fonts/SourceCodePro_FontsOnly-1.009/SourceCodePro-Regular.ttf
	new file:   generic/fonts/SourceCodePro_FontsOnly-1.009/SourceCodePro-Semibold.otf
	new file:   generic/fonts/SourceCodePro_FontsOnly-1.009/SourceCodePro-Semibold.ttf
	new file:   generic/fonts/SourceCodePro_FontsOnly-1.009/SourceCodeProReadMe.html
	new file:   generic/wallpapers/phone_background.gif
	new file:   linux/.Xresources
	new file:   linux/.config/awesome/rc.lua
	new file:   linux/.config/awesome/theme_default.lua
	new file:   linux/.tmux.conf
	new file:   linux/.xinitrc
	new file:   linux/copy_of_xorg.conf
	new file:   mac_osx/.Xresources
	new file:   mac_osx/.tmux.conf
	new file:   mac_osx/.xinitrc
Merge branch 'master' of https://github.com/asoplata/config

Conflicts:
	config_setup.sh

UGH apparently amend ACTUALLY AMENDS now, you need a phd to understand
git.

	modified:   generic/.bashrc