changed stuff
Merge branch 'master' of https://github.com/Egg3141592654/RBE3002-B13Final

pull from dev