Merge remote-tracking branch 'tom/master'
Merge remote-tracking branch 'tom/master'
Merge remote-tracking branch 'tom/master'
implemented decals
Merge remote-tracking branch 'tom/master'
Merge remote-tracking branch 'tom/master'
added Decals, unoptimized code here