possible bug fix for reset crash
Merge branch 'dev' of https://github.com/tortal/IT2-LP1-Tendu.git into dev