Merge branch 'master' of https://github.com/c58/nn_experements

Conflicts:
	econ_indi_history.py
Merge branch 'master' of https://github.com/c58/nn_experements

Conflicts:
	econ_indi_history.py
Merge branch 'master' of https://github.com/c58/nn_experements

Conflicts:
	econ_indi_history.py