Revert "Week 8"
Merge pull request #5 from is210-2014-fall-02/revert-4-master

Revert "Week 8"