Got pretty much everything working for my parts. If you need me to do anything more or explain my logic (I can code really strangely sometimes and even with comments it can be hard to figure out what I'm trying to do) If the textures don't load, don't worry its because you are viewing it from file:// instead of http:// but I have an apache install on my laptop so when we show it on wednesday we can just use mine and the textures will show up perfectly
Merge remote-tracking branch 'origin/master'