some changes
more changes
changes
changes
silly changes
Merge branch 'master' of https://github.com/akshaym/dotfiles

Conflicts:
	vimrc
highlights lines longer than 80 chars