Initial commit
vimrc added
Merge https://github.com/tafman/config

* https://github.com/tafman/config:
  Initial commit
bashrc added
no line numbers in vim
bla
Merge branch 'master' of https://github.com/tafman/config

* 'master' of https://github.com/tafman/config:
  first commit
  test

Conflicts:
	.bashrc
	.vimrc