minor changes
commit merged version

Merge branch 'master' of git://github.com/wlyra/transitional-disk

Conflicts:
	tex/trapping.tex