Merge branch 'master' of https://github.com/tomMoral/sentana

Conflicts:
	code/load.py