Revert 'Merge pull request #8 from jhzh01/tech-day-2014'

This reverts commit 8bad1472d4a5ed25a02861b0bf62354f4774119d, reversing
changes made to fef0e7687bd2d792d8ff67611ba52db75a31c118.