.
Merge branch 'master' of https://github.com/hallmao/Projeto-IC-2014

Conflicts:
	Integracao Final/Final 10.1/ODE_Solver.py
	Integracao Final/Final 10.1/ODE_methods.pyc
	Integracao Final/Final 10.1/icon_embedded.pyc
	Integracao Final/Final 10.1/leibniz_image_embedded.pyc
	Integracao Final/Final 10.1/v5_support.pyc