introduction to non-axisymmetric problem
non-axisymmetric problem with u=v
Merge remote-tracking branch 'upstream/master'

Conflicts:
	tex/trapping.tex
non-axi prob for v=u
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/wlyra/transitional-disk

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