jsambuo/cmu-2014-gizmo — pull request #1 by jsambuo (2014-01-30 02:02:14+00:00)
Title: Merge changes

Merge from Alex's branch to my branch