Adding Tabular
Merge branch 'master' of https://github.com/ignasigarcia/dot_files

Conflicts:
	vimrc