Wooohooo
Merge pull request #7 from DigitalDesign-Spring2013/thomas

Wooohooo