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

Conflicts:
	tex/trapping.tex
nonaxi v3 with fig