Revert "Lab1 9/30/2014"

This reverts commit 41d451ad6ba84a87aa42d53a786abb08741357e5.