local_changes
Merge branch 'master' of https://github.com/franciscoangel/numerical-mooc

Conflicts:
	lessons/01_phugoid/01_02_Phugoid_Oscillation.ipynb
Merge branch 'master' of https://github.com/franciscoangel/numerical-mooc
Merge branch 'master' of https://github.com/franciscoangel/numerical-mooc
update_for_chapter3
Merge branch 'master' of https://github.com/franciscoangel/numerical-mooc

Conflicts:
	lessons/02_spacetime/02_01_1DConvection.ipynb