Data resetted to 0
Merge branch 'master' of github.com:jpcaissy/inm5151

Conflicts:
	data.txt