Merge branch 'master' of https://github.com/suavecode/Tutorials

Conflicts:
	tut_opt_lithium_air_jet.py

Author: jmvegh