blah
Merge branch 'master' of ssh://github.com/Womble/disc-paper

Conflicts:
	paper.aux
Merge branch 'master' of ssh://github.com/Womble/disc-paper
text changes