Unknown changes.
Merge branch 'master' of ssh://github.com/travisdesell/flight_analyis

Conflicts:
	artificial_neural_network.cxx
Updates to error calculation