OSDN Git Service

Merge pull request #40 from Bytom/dev
authorZhiting Lin <zlin035@uottawa.ca>
Fri, 8 Jun 2018 02:11:27 +0000 (10:11 +0800)
committerGitHub <noreply@github.com>
Fri, 8 Jun 2018 02:11:27 +0000 (10:11 +0800)
Dev


Trivial merge