Fixing bugs and stuff
Merge branch 'master' of https://github.com/kapadiamush/Eve-s-Adventure.git