school computer stuff
Merge branch 'master' of https://github.com/ryerson/vim

Conflicts:
	vimrc