Fucked up before so now I'm actually commiting the write code.
Merge branch 'master' of https://github.com/FalconGames/Splice