Sapein/Computercraft-Stuff — pull request #1 by Sapein (2014-01-05 02:20:35+00:00)
Title: Lets merge these two

Lets merge these two together.