expanded intro by two paragraphs on theory work
Resolved a conflict in the acknowledge

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

Conflicts:
	tex/trapping.tex
minor wording edits. new refs. good to go.