new file:   .bash_aliases
	new file:   .bash_aliases.root
	new file:   .bashrc
	new file:   .bashrc-root
	new file:   .bashrc.root
	new file:   .vimrc
	new file:   authorized_keys
	new file:   authorized_keys2
	new file:   fstab
	new file:   gnome-extensions-list/Screenshot from 2013-02-25 11:25:35.png
	new file:   gnome-extensions-list/Screenshot from 2013-02-25 11:25:46.png
	new file:   gnome-extensions-list/Screenshot from 2013-02-25 11:25:55.png
	new file:   gnome-extensions-list/Screenshot from 2013-02-25 11:26:08.png
	new file:   gnomeshell-workspaces-dualmon.txt
	new file:   hosts
	new file:   id_rsa
	new file:   id_rsa.pub
	new file:   jmoren@10.1.160.221
	new file:   known_hosts
	new file:   screenrc
Merge branch 'master' of https://github.com/jmoren702/MyLinuxConfigs

Conflicts:
	.bash_aliases
	.bashrc
	authorized_keys
	authorized_keys2
	fstab
	hosts
	id_rsa
	id_rsa.pub
	known_hosts

	modified:   .bash_aliases
	modified:   .bashrc
	modified:   authorized_keys
	modified:   authorized_keys2
	modified:   fstab
        modified:   hosts
	modified:   id_rsa
	modified:   id_rsa.pub
	modified:   known_hosts