Merge pull request #1 from dlab-berkeley/master

Testing if this approach for pull requests works
Merge remote-tracking branch 'origin'