Initial commit
first commit
first commit
first commit
Merge branch 'master' of https://github.com/bakoenig/config
Merge branch 'master' of https://github.com/bakoenig/config
commit
bla bla
Xdefaults added
commit all the other files
Create README.md
small change
Update rc.lua
small change
jaja
change
Update .vimrc
Update .vimrc
Merge branch 'master' of https://github.com/bakoenig/config into HEAD

Conflicts:
	.vimrc
Merge branch 'master' of https://github.com/bakoenig/config into HEAD