Staging work, previous to solvin conflicts
Merge branch 'master' of https://github.com/guillemborrell/pytnt

Conflicts:
	stats.py