front end doesn't totally work but at least it doesn't error
Merge branch 'master' of https://github.com/kapadiamush/Eve-s-Adventure