changing some things but idk if its working
Merge branch 'master' of github.com:gundermanc/eecs290-unity3d-final
code broke