emacs init test
test
removed junk emacz file
removed .emacs
added .emacs
removed .emacs
test
Merge branch 'master' of https://github.com/shanesully/emacs
removed test file
added a test file again
added irssi config
Added the .vimrc
test commit
test. removed stuff
fixed the vimrc
fixed vimrc
removed the c test file
Merge branch 'master' of https://github.com/shanesully/vim

Conflicts:
	.vimrc