don't know what i changed.
fixed conflict in draft.text

Merge branch 'master' of github.com:mhedwards/wombat-VCP

Conflicts:
	report/draft.tex