Merge branch 'master' into shnupbups
Merge pull request #50 from OmgImAlexis/master

Pulling from master.
Merge pull request #51 from OmgImAlexis/shnupbups

Shnupbups
Merge pull request #53 from OmgImAlexis/lex

Pipes are rendering and the proxies are fixed.
Fixed the pipe spike texture issue