Merge pull request #41 from mdeters/tianyi-merge
authorTianyi Liang <tianyi-liang@uiowa.edu>
Tue, 24 Jun 2014 06:35:45 +0000 (14:35 +0800)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Tue, 24 Jun 2014 06:35:45 +0000 (14:35 +0800)
commit92b91586e48e5cc47ae998ecd2f9b0037a3ee174
tree8a1903164e4300b606beb9b64d663f3d2946709c
parentc948e9517b7b5f0bacb055ab2ad320f889c3fb49
parent7736abe3b9c898033737865f033cc5cfe0f7922f
Merge pull request #41 from mdeters/tianyi-merge

Merge from Tianyi