Merge pull request #5 from Aurilux/master

Final commit of the night
Done some stuff
Done some stuff
Fixed conflicts (GOD THEY'RE ANNOYING)
Changed some textures
Merge remote-tracking branch 'upstream/master'
Improved integ table slots
Merge remote-tracking branch 'upstream/master'
Commit before merge