add function to read from a file
Merge branch 'file_input'

Conflicts:
	python/main.py
Conflit clas_and_functions.py resolved