Note to self: Dont work on others computer.
Merge pull request #5 from DigitalDesign-Spring2013/master

Do NOT work on someone elses computer.