Hopefully fixed prefabs messing up
Merge branch 'master' of https://github.com/pdelbarba/EECS290_Project3