forced commit
vim margin

Merge branch 'csug' of github.com:nmbook/.files into csug

Conflicts:
	.gitconfig