Paper: Teaching numerical methods with IPython notebooks and inquiry-based learning (Ketcheson)

Fix merge artifact