resets working for the most part
Merge branch 'master' of https://github.com/kapadiamush/Eve-s-Adventure